diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php
index 79f69ab5da8..6b5e0681139 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php
@@ -28,11 +28,11 @@ public function execute()
                 )->markAsRead(
                     $notificationId
                 );
-                $this->messageManager->addSuccess(__('The message has been marked as Read.'));
+                $this->messageManager->addSuccessMessage(__('The message has been marked as Read.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException(
+                $this->messageManager->addExceptionMessage(
                     $e,
                     __("We couldn't mark the notification as Read because of an error.")
                 );
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php
index 9e61b8ff4b8..9ae4a7cdac0 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php
@@ -23,7 +23,7 @@ public function execute()
     {
         $ids = $this->getRequest()->getParam('notification');
         if (!is_array($ids)) {
-            $this->messageManager->addError(__('Please select messages.'));
+            $this->messageManager->addErrorMessage(__('Please select messages.'));
         } else {
             try {
                 foreach ($ids as $id) {
@@ -32,13 +32,13 @@ public function execute()
                         $model->setIsRead(1)->save();
                     }
                 }
-                $this->messageManager->addSuccess(
+                $this->messageManager->addSuccessMessage(
                     __('A total of %1 record(s) have been marked as Read.', count($ids))
                 );
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException(
+                $this->messageManager->addExceptionMessage(
                     $e,
                     __("We couldn't mark the notification as Read because of an error.")
                 );
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php
index 94c7d955f59..06659b8452c 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php
@@ -23,7 +23,7 @@ public function execute()
     {
         $ids = $this->getRequest()->getParam('notification');
         if (!is_array($ids)) {
-            $this->messageManager->addError(__('Please select messages.'));
+            $this->messageManager->addErrorMessage(__('Please select messages.'));
         } else {
             try {
                 foreach ($ids as $id) {
@@ -32,11 +32,14 @@ public function execute()
                         $model->setIsRemove(1)->save();
                     }
                 }
-                $this->messageManager->addSuccess(__('Total of %1 record(s) have been removed.', count($ids)));
+                $this->messageManager->addSuccessMessage(__('Total of %1 record(s) have been removed.', count($ids)));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));
+                $this->messageManager->addExceptionMessage(
+                    $e,
+                    __("We couldn't remove the messages because of an error.")
+                );
             }
         }
         $this->_redirect('adminhtml/*/');
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php
index 17f911339cb..f0724a9587c 100644
--- a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php
+++ b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php
@@ -31,11 +31,14 @@ public function execute()
 
             try {
                 $model->setIsRemove(1)->save();
-                $this->messageManager->addSuccess(__('The message has been removed.'));
+                $this->messageManager->addSuccessMessage(__('The message has been removed.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
-                $this->messageManager->addError($e->getMessage());
+                $this->messageManager->addErrorMessage($e->getMessage());
             } catch (\Exception $e) {
-                $this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));
+                $this->messageManager->addExceptionMessage(
+                    $e,
+                    __("We couldn't remove the messages because of an error.")
+                );
             }
 
             $this->_redirect('adminhtml/*/');
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
index 7ddd5e3bb2a..9047cc6481e 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\AdvancedPricingImportExport\Model\Export;
 
+use Magento\ImportExport\Model\Export;
 use Magento\Store\Model\Store;
 use Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
 use Magento\AdvancedPricingImportExport\Model\Import\AdvancedPricing as ImportAdvancedPricing;
@@ -79,6 +80,11 @@ class AdvancedPricing extends \Magento\CatalogImportExport\Model\Export\Product
         ImportAdvancedPricing::COL_TIER_PRICE_TYPE => ''
     ];
 
+    /**
+     * @var string[]
+     */
+    private $websiteCodesMap = [];
+
     /**
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Eav\Model\Config $config
@@ -255,36 +261,131 @@ public function filterAttributeCollection(\Magento\Eav\Model\ResourceModel\Entit
      */
     protected function getExportData()
     {
+        if ($this->_passTierPrice) {
+            return [];
+        }
+
         $exportData = [];
         try {
-            $rawData = $this->collectRawData();
-            $productIds = array_keys($rawData);
-            if (isset($productIds)) {
-                if (!$this->_passTierPrice) {
-                    $exportData = array_merge(
-                        $exportData,
-                        $this->getTierPrices($productIds, ImportAdvancedPricing::TABLE_TIER_PRICE)
-                    );
+            $productsByStores = $this->loadCollection();
+            if (!empty($productsByStores)) {
+                $linkField = $this->getProductEntityLinkField();
+                $productLinkIds = [];
+
+                foreach ($productsByStores as $product) {
+                    $productLinkIds[array_pop($product)[$linkField]] = true;
+                }
+                $productLinkIds = array_keys($productLinkIds);
+                $tierPricesData = $this->fetchTierPrices($productLinkIds);
+                $exportData = $this->prepareExportData(
+                    $productsByStores,
+                    $tierPricesData
+                );
+                if (!empty($exportData)) {
+                    asort($exportData);
                 }
             }
-            if ($exportData) {
-                $exportData = $this->correctExportData($exportData);
-            }
-            if (isset($exportData)) {
-                asort($exportData);
-            }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->_logger->critical($e);
         }
+
         return $exportData;
     }
 
+    /**
+     * Creating export-formatted row from tier price.
+     *
+     * @param array $tierPriceData Tier price information.
+     *
+     * @return array Formatted for export tier price information.
+     */
+    private function createExportRow(array $tierPriceData): array
+    {
+        //List of columns to display in export row.
+        $exportRow = $this->templateExportData;
+
+        foreach (array_keys($exportRow) as $keyTemplate) {
+            if (array_key_exists($keyTemplate, $tierPriceData)) {
+                if (in_array($keyTemplate, $this->_priceWebsite)) {
+                    //If it's website column then getting website code.
+                    $exportRow[$keyTemplate] = $this->_getWebsiteCode(
+                        $tierPriceData[$keyTemplate]
+                    );
+                } elseif (in_array($keyTemplate, $this->_priceCustomerGroup)) {
+                    //If it's customer group column then getting customer
+                    //group name by ID.
+                    $exportRow[$keyTemplate] = $this->_getCustomerGroupById(
+                        $tierPriceData[$keyTemplate],
+                        $tierPriceData[ImportAdvancedPricing::VALUE_ALL_GROUPS]
+                    );
+                    unset($exportRow[ImportAdvancedPricing::VALUE_ALL_GROUPS]);
+                } elseif ($keyTemplate
+                    === ImportAdvancedPricing::COL_TIER_PRICE
+                ) {
+                    //If it's price column then getting value and type
+                    //of tier price.
+                    $exportRow[$keyTemplate]
+                        = $tierPriceData[ImportAdvancedPricing::COL_TIER_PRICE_PERCENTAGE_VALUE]
+                        ? $tierPriceData[ImportAdvancedPricing::COL_TIER_PRICE_PERCENTAGE_VALUE]
+                        : $tierPriceData[ImportAdvancedPricing::COL_TIER_PRICE];
+                    $exportRow[ImportAdvancedPricing::COL_TIER_PRICE_TYPE]
+                        = $this->tierPriceTypeValue($tierPriceData);
+                } else {
+                    //Any other column just goes as is.
+                    $exportRow[$keyTemplate] = $tierPriceData[$keyTemplate];
+                }
+            }
+        }
+
+        return $exportRow;
+    }
+
+    /**
+     * Prepare data for export.
+     *
+     * @param array $productsData Products to export.
+     * @param array $tierPricesData Their tier prices.
+     *
+     * @return array Export rows to display.
+     */
+    private function prepareExportData(
+        array $productsData,
+        array $tierPricesData
+    ): array {
+        //Assigning SKUs to tier prices data.
+        $productLinkIdToSkuMap = [];
+        foreach ($productsData as $productData) {
+            $productLinkIdToSkuMap[$productData[Store::DEFAULT_STORE_ID][$this->getProductEntityLinkField()]]
+                = $productData[Store::DEFAULT_STORE_ID]['sku'];
+        }
+
+        //Adding products' SKUs to tier price data.
+        $linkedTierPricesData = [];
+        foreach ($tierPricesData as $tierPriceData) {
+            $sku = $productLinkIdToSkuMap[$tierPriceData['product_link_id']];
+            $linkedTierPricesData[] = array_merge(
+                $tierPriceData,
+                [ImportAdvancedPricing::COL_SKU => $sku]
+            );
+        }
+
+        //Formatting data for export.
+        $customExportData = [];
+        foreach ($linkedTierPricesData as $row) {
+            $customExportData[] = $this->createExportRow($row);
+        }
+
+        return $customExportData;
+    }
+
     /**
      * Correct export data.
      *
      * @param array $exportData
      * @return array
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     * @deprecated
+     * @see prepareExportData
      */
     protected function correctExportData($exportData)
     {
@@ -327,16 +428,83 @@ protected function correctExportData($exportData)
     /**
      * Check type for tier price.
      *
-     * @param string $tierPricePercentage
+     * @param array $tierPriceData
      * @return string
      */
-    private function tierPriceTypeValue($tierPricePercentage)
+    private function tierPriceTypeValue(array $tierPriceData): string
     {
-        return $tierPricePercentage
+        return $tierPriceData[ImportAdvancedPricing::COL_TIER_PRICE_PERCENTAGE_VALUE]
             ? ImportAdvancedPricing::TIER_PRICE_TYPE_PERCENT
             : ImportAdvancedPricing::TIER_PRICE_TYPE_FIXED;
     }
 
+    /**
+     * Load tier prices for given products.
+     *
+     * @param string[] $productIds Link IDs of products to find tier prices for.
+     *
+     * @return array Tier prices data.
+     *
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    private function fetchTierPrices(array $productIds): array
+    {
+        if (empty($productIds)) {
+            throw new \InvalidArgumentException(
+                'Can only load tier prices for specific products'
+            );
+        }
+
+        $pricesTable = ImportAdvancedPricing::TABLE_TIER_PRICE;
+        $exportFilter = null;
+        $priceFromFilter = null;
+        $priceToFilter = null;
+        if (isset($this->_parameters[Export::FILTER_ELEMENT_GROUP])) {
+            $exportFilter = $this->_parameters[Export::FILTER_ELEMENT_GROUP];
+        }
+        $productEntityLinkField = $this->getProductEntityLinkField();
+        $selectFields = [
+            ImportAdvancedPricing::COL_TIER_PRICE_WEBSITE => 'ap.website_id',
+            ImportAdvancedPricing::VALUE_ALL_GROUPS => 'ap.all_groups',
+            ImportAdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => 'ap.customer_group_id',
+            ImportAdvancedPricing::COL_TIER_PRICE_QTY => 'ap.qty',
+            ImportAdvancedPricing::COL_TIER_PRICE => 'ap.value',
+            ImportAdvancedPricing::COL_TIER_PRICE_PERCENTAGE_VALUE => 'ap.percentage_value',
+            'product_link_id' => 'ap.' .$productEntityLinkField,
+        ];
+        if ($exportFilter && array_key_exists('tier_price', $exportFilter)) {
+            if (!empty($exportFilter['tier_price'][0])) {
+                $priceFromFilter = $exportFilter['tier_price'][0];
+            }
+            if (!empty($exportFilter['tier_price'][1])) {
+                $priceToFilter = $exportFilter['tier_price'][1];
+            }
+        }
+
+        $select = $this->_connection->select()
+            ->from(
+                ['ap' => $this->_resource->getTableName($pricesTable)],
+                $selectFields
+            )
+            ->where(
+                'ap.'.$productEntityLinkField.' IN (?)',
+                $productIds
+            );
+
+        if ($priceFromFilter !== null) {
+            $select->where('ap.value >= ?', $priceFromFilter);
+        }
+        if ($priceToFilter !== null) {
+            $select->where('ap.value <= ?', $priceToFilter);
+        }
+        if ($priceFromFilter || $priceToFilter) {
+            $select->orWhere('ap.percentage_value IS NOT NULL');
+        }
+
+        return $this->_connection->fetchAll($select);
+    }
+
     /**
      * Get tier prices.
      *
@@ -345,6 +513,8 @@ private function tierPriceTypeValue($tierPricePercentage)
      * @return array|bool
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @deprecated
+     * @see fetchTierPrices
      */
     protected function getTierPrices(array $listSku, $table)
     {
@@ -413,40 +583,51 @@ protected function getTierPrices(array $listSku, $table)
     }
 
     /**
-     * Get Website code
+     * Get Website code.
      *
      * @param int $websiteId
+     *
      * @return string
      */
-    protected function _getWebsiteCode($websiteId)
+    protected function _getWebsiteCode(int $websiteId): string
     {
-        $storeName = ($websiteId == 0)
-            ? ImportAdvancedPricing::VALUE_ALL_WEBSITES
-            : $this->_storeManager->getWebsite($websiteId)->getCode();
-        $currencyCode = '';
-        if ($websiteId == 0) {
-            $currencyCode = $this->_storeManager->getWebsite($websiteId)->getBaseCurrencyCode();
-        }
-        if ($storeName && $currencyCode) {
-            return $storeName . ' [' . $currencyCode . ']';
-        } else {
-            return $storeName;
+        if (!array_key_exists($websiteId, $this->websiteCodesMap)) {
+            $storeName = ($websiteId == 0)
+                ? ImportAdvancedPricing::VALUE_ALL_WEBSITES
+                : $this->_storeManager->getWebsite($websiteId)->getCode();
+            $currencyCode = '';
+            if ($websiteId == 0) {
+                $currencyCode = $this->_storeManager->getWebsite($websiteId)
+                    ->getBaseCurrencyCode();
+            }
+
+            if ($storeName && $currencyCode) {
+                $code = $storeName.' ['.$currencyCode.']';
+            } else {
+                $code = $storeName;
+            }
+            $this->websiteCodesMap[$websiteId] = $code;
         }
+
+        return $this->websiteCodesMap[$websiteId];
     }
 
     /**
-     * Get Customer Group By Id
+     * Get Customer Group By Id.
+     *
+     * @param int $groupId
+     * @param int $allGroups
      *
-     * @param int $customerGroupId
-     * @param null $allGroups
      * @return string
      */
-    protected function _getCustomerGroupById($customerGroupId, $allGroups = null)
-    {
-        if ($allGroups) {
+    protected function _getCustomerGroupById(
+        int $groupId,
+        int $allGroups = 0
+    ): string {
+        if ($allGroups !== 0) {
             return ImportAdvancedPricing::VALUE_ALL_GROUPS;
         } else {
-            return $this->_groupRepository->getById($customerGroupId)->getCode();
+            return $this->_groupRepository->getById($groupId)->getCode();
         }
     }
 
diff --git a/app/code/Magento/AsynchronousOperations/Api/BulkStatusInterface.php b/app/code/Magento/AsynchronousOperations/Api/BulkStatusInterface.php
new file mode 100644
index 00000000000..88db2d6d801
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Api/BulkStatusInterface.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Api;
+
+/**
+ * Interface BulkStatusInterface
+ * Bulk summary data with list of operations items short data.
+ *
+ * @api
+ */
+interface BulkStatusInterface extends \Magento\Framework\Bulk\BulkStatusInterface
+{
+    /**
+     * Get Bulk summary data with list of operations items full data.
+     *
+     * @param string $bulkUuid
+     * @return \Magento\AsynchronousOperations\Api\Data\DetailedBulkOperationsStatusInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function getBulkDetailedStatus($bulkUuid);
+
+    /**
+     * Get Bulk summary data with list of operations items short data.
+     *
+     * @param string $bulkUuid
+     * @return \Magento\AsynchronousOperations\Api\Data\BulkOperationsStatusInterface
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function getBulkShortStatus($bulkUuid);
+}
diff --git a/app/code/Magento/AsynchronousOperations/Api/Data/AsyncResponseInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/AsyncResponseInterface.php
new file mode 100644
index 00000000000..c7edd5c8ff9
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Api/Data/AsyncResponseInterface.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Api\Data;
+
+/**
+ * Interface AsyncResponseInterface
+ * Temporary data object to give response from webapi async router
+ *
+ * @api
+ */
+interface AsyncResponseInterface
+{
+    const BULK_UUID = 'bulk_uuid';
+    const REQUEST_ITEMS = 'request_items';
+    const ERRORS = 'errors';
+
+    /**
+     * Gets the bulk uuid.
+     *
+     * @return string Bulk Uuid.
+     */
+    public function getBulkUuid();
+
+    /**
+     * Sets the bulk uuid.
+     *
+     * @param string $bulkUuid
+     * @return $this
+     */
+    public function setBulkUuid($bulkUuid);
+
+    /**
+     * Gets the list of request items with status data.
+     *
+     * @return \Magento\AsynchronousOperations\Api\Data\ItemStatusInterface[]
+     */
+    public function getRequestItems();
+
+    /**
+     * Sets the list of request items with status data.
+     *
+     * @param \Magento\AsynchronousOperations\Api\Data\ItemStatusInterface[] $requestItems
+     * @return $this
+     */
+    public function setRequestItems($requestItems);
+
+    /**
+     * @param bool $isErrors
+     * @return $this
+     */
+    public function setErrors($isErrors = false);
+
+    /**
+     * Is there errors during processing bulk
+     *
+     * @return boolean
+     */
+    public function isErrors();
+
+    /**
+     * Retrieve existing extension attributes object.
+     *
+     * @return \Magento\AsynchronousOperations\Api\Data\AsyncResponseExtensionInterface|null
+     */
+    public function getExtensionAttributes();
+
+    /**
+     * Set an extension attributes object.
+     *
+     * @param \Magento\AsynchronousOperations\Api\Data\AsyncResponseExtensionInterface $extensionAttributes
+     * @return $this
+     */
+    public function setExtensionAttributes(
+        \Magento\AsynchronousOperations\Api\Data\AsyncResponseExtensionInterface $extensionAttributes
+    );
+}
diff --git a/app/code/Magento/AsynchronousOperations/Api/Data/BulkOperationsStatusInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/BulkOperationsStatusInterface.php
new file mode 100644
index 00000000000..f8b7e389d38
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Api/Data/BulkOperationsStatusInterface.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Api\Data;
+
+/**
+ * Interface BulkStatusInterface
+ *
+ * Bulk summary data with list of operations items summary data.
+ *
+ * @api
+ */
+interface BulkOperationsStatusInterface extends BulkSummaryInterface
+{
+
+    const OPERATIONS_LIST = 'operations_list';
+
+    /**
+     * Retrieve list of operation with statuses (short data).
+     *
+     * @return \Magento\AsynchronousOperations\Api\Data\SummaryOperationStatusInterface[]
+     */
+    public function getOperationsList();
+
+    /**
+     * Set operations list.
+     *
+     * @param \Magento\AsynchronousOperations\Api\Data\SummaryOperationStatusInterface[] $operationStatusList
+     * @return $this
+     */
+    public function setOperationsList($operationStatusList);
+}
diff --git a/app/code/Magento/AsynchronousOperations/Api/Data/DetailedBulkOperationsStatusInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/DetailedBulkOperationsStatusInterface.php
new file mode 100644
index 00000000000..3edc5167e09
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Api/Data/DetailedBulkOperationsStatusInterface.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Api\Data;
+
+/**
+ * Interface BulkStatusInterface
+ *
+ * Bulk summary data with list of operations items full data.
+ *
+ * @api
+ */
+interface DetailedBulkOperationsStatusInterface extends BulkSummaryInterface
+{
+
+    const OPERATIONS_LIST = 'operations_list';
+
+    /**
+     * Retrieve operations list.
+     *
+     * @return \Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface[]
+     */
+    public function getOperationsList();
+
+    /**
+     * Set operations list.
+     *
+     * @param \Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface[] $operationStatusList
+     * @return $this
+     */
+    public function setOperationsList($operationStatusList);
+}
diff --git a/app/code/Magento/AsynchronousOperations/Api/Data/DetailedOperationStatusInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/DetailedOperationStatusInterface.php
new file mode 100644
index 00000000000..217d4ad9279
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Api/Data/DetailedOperationStatusInterface.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Api\Data;
+
+/**
+ * @api
+ */
+interface DetailedOperationStatusInterface extends OperationInterface
+{
+    /**
+     * Result serialized Data
+     *
+     * @return string
+     */
+    public function getResultSerializedData();
+
+    /**
+     * Set result serialized data
+     *
+     * @param string $resultSerializedData
+     * @return $this
+     */
+    public function setResultSerializedData($resultSerializedData);
+}
diff --git a/app/code/Magento/AsynchronousOperations/Api/Data/ItemStatusInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/ItemStatusInterface.php
new file mode 100644
index 00000000000..3294078c2c1
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Api/Data/ItemStatusInterface.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Api\Data;
+
+/**
+ * ItemStatusInterface interface
+ * Temporary object with status of requested item.
+ * Indicate if entity param was Accepted|Rejected to bulk schedule
+ *
+ * @api
+ */
+interface ItemStatusInterface
+{
+    const ENTITY_ID = 'entity_id';
+    const DATA_HASH = 'data_hash';
+    const STATUS = 'status';
+    const ERROR_MESSAGE = 'error_message';
+    const ERROR_CODE = 'error_code';
+
+    const STATUS_ACCEPTED = 'accepted';
+    const STATUS_REJECTED = 'rejected';
+
+    /**
+     * Get entity Id.
+     *
+     * @return int
+     */
+    public function getId();
+
+    /**
+     * Sets entity Id.
+     *
+     * @param int $entityId
+     * @return $this
+     */
+    public function setId($entityId);
+
+    /**
+     * Get hash of entity data.
+     *
+     * @return string md5 hash of entity params array.
+     */
+    public function getDataHash();
+
+    /**
+     * Sets hash of entity data.
+     *
+     * @param string $hash md5 hash of entity params array.
+     * @return $this
+     */
+    public function setDataHash($hash);
+
+    /**
+     * Get status.
+     *
+     * @return string accepted|rejected
+     */
+    public function getStatus();
+
+    /**
+     * Sets entity status.
+     *
+     * @param string $status accepted|rejected
+     * @return $this
+     */
+    public function setStatus($status = self::STATUS_ACCEPTED);
+
+    /**
+     * Get error information.
+     *
+     * @return string|null
+     */
+    public function getErrorMessage();
+
+    /**
+     * Sets error information.
+     *
+     * @param string|null|\Exception $error
+     * @return $this
+     */
+    public function setErrorMessage($error = null);
+
+    /**
+     * Get error code.
+     *
+     * @return int|null
+     */
+    public function getErrorCode();
+
+    /**
+     * Sets error information.
+     *
+     * @param int|null|\Exception $errorCode Default: null
+     * @return $this
+     */
+    public function setErrorCode($errorCode = null);
+}
diff --git a/app/code/Magento/AsynchronousOperations/Api/Data/SummaryOperationStatusInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/SummaryOperationStatusInterface.php
new file mode 100644
index 00000000000..3b9f53b3416
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Api/Data/SummaryOperationStatusInterface.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Api\Data;
+
+/**
+ * Getter Class OperationsStatusInterface
+ * Instead of OperationInterface this class don't provide all operation data
+ * and not responsive to set any data, just to get operation data
+ * without serialized_data and result_serialized_data
+ *
+ * @api
+ */
+interface SummaryOperationStatusInterface
+{
+    /**
+     * Operation id
+     *
+     * @return int
+     */
+    public function getId();
+
+    /**
+     * Get operation status
+     *
+     * OPEN | COMPLETE | RETRIABLY_FAILED | NOT_RETRIABLY_FAILED
+     *
+     * @return int
+     */
+    public function getStatus();
+
+    /**
+     * Get result message
+     *
+     * @return string
+     */
+    public function getResultMessage();
+
+    /**
+     * Get error code
+     *
+     * @return int
+     */
+    public function getErrorCode();
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/AsyncResponse.php b/app/code/Magento/AsynchronousOperations/Model/AsyncResponse.php
new file mode 100644
index 00000000000..02a2e8de1fa
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/AsyncResponse.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\AsyncResponseInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\Api\ExtensibleDataInterface;
+
+class AsyncResponse extends DataObject implements AsyncResponseInterface, ExtensibleDataInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getBulkUuid()
+    {
+        return $this->getData(self::BULK_UUID);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setBulkUuid($bulkUuid)
+    {
+        return $this->setData(self::BULK_UUID, $bulkUuid);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getRequestItems()
+    {
+        return $this->getData(self::REQUEST_ITEMS);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setRequestItems($requestItems)
+    {
+        return $this->setData(self::REQUEST_ITEMS, $requestItems);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setErrors($isErrors = false)
+    {
+        return $this->setData(self::ERRORS, $isErrors);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function isErrors()
+    {
+        return $this->getData(self::ERRORS);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getExtensionAttributes()
+    {
+        return $this->getData(self::EXTENSION_ATTRIBUTES_KEY);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setExtensionAttributes(
+        \Magento\AsynchronousOperations\Api\Data\AsyncResponseExtensionInterface $extensionAttributes
+    ) {
+        return $this->setData(self::EXTENSION_ATTRIBUTES_KEY, $extensionAttributes);
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/BulkOperationsStatus.php b/app/code/Magento/AsynchronousOperations/Model/BulkOperationsStatus.php
new file mode 100644
index 00000000000..5fc164ec833
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/BulkOperationsStatus.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\EntityManager\EntityManager;
+use Magento\AsynchronousOperations\Api\Data\BulkOperationsStatusInterfaceFactory as BulkStatusShortFactory;
+use Magento\AsynchronousOperations\Api\Data\DetailedBulkOperationsStatusInterfaceFactory as BulkStatusDetailedFactory;
+use Magento\AsynchronousOperations\Api\Data\OperationDetailsInterfaceFactory;
+use Magento\AsynchronousOperations\Api\BulkStatusInterface;
+use Magento\AsynchronousOperations\Model\ResourceModel\Operation\CollectionFactory;
+
+/**
+ * Class BulkStatus
+ */
+class BulkOperationsStatus implements BulkStatusInterface
+{
+    /**
+     * @var EntityManager
+     */
+    private $entityManager;
+
+    /**
+     * @var BulkStatusDetailedFactory
+     */
+    private $bulkDetailedFactory;
+
+    /**
+     * @var BulkStatusShortFactory
+     */
+    private $bulkShortFactory;
+
+    /**
+     * @var BulkStatus
+     */
+    private $bulkStatus;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $operationCollectionFactory;
+
+    /**
+     * Init dependencies.
+     *
+     * @param BulkStatus $bulkStatus
+     * @param CollectionFactory $operationCollection
+     * @param BulkStatusDetailedFactory $bulkDetailedFactory
+     * @param BulkStatusShortFactory $bulkShortFactory
+     * @param \Magento\Framework\EntityManager\EntityManager $entityManager
+     */
+    public function __construct(
+        BulkStatus $bulkStatus,
+        CollectionFactory $operationCollection,
+        BulkStatusDetailedFactory $bulkDetailedFactory,
+        BulkStatusShortFactory $bulkShortFactory,
+        EntityManager $entityManager
+    ) {
+        $this->operationCollectionFactory = $operationCollection;
+        $this->bulkStatus = $bulkStatus;
+        $this->bulkDetailedFactory = $bulkDetailedFactory;
+        $this->bulkShortFactory = $bulkShortFactory;
+        $this->entityManager = $entityManager;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFailedOperationsByBulkId($bulkUuid, $failureType = null)
+    {
+        return $this->bulkStatus->getFailedOperationsByBulkId($bulkUuid, $failureType);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOperationsCountByBulkIdAndStatus($bulkUuid, $status)
+    {
+        return $this->bulkStatus->getOperationsCountByBulkIdAndStatus($bulkUuid, $status);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getBulksByUser($userId)
+    {
+        return $this->bulkStatus->getBulksByUser($userId);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getBulkStatus($bulkUuid)
+    {
+        return $this->bulkStatus->getBulkStatus($bulkUuid);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getBulkDetailedStatus($bulkUuid)
+    {
+        $bulkSummary = $this->bulkDetailedFactory->create();
+
+        /** @var \Magento\AsynchronousOperations\Api\Data\DetailedBulkOperationsStatusInterface $bulk */
+        $bulk = $this->entityManager->load($bulkSummary, $bulkUuid);
+
+        if ($bulk->getBulkId() === null) {
+            throw new NoSuchEntityException(
+                __(
+                    'Bulk uuid %bulkUuid not exist',
+                    ['bulkUuid' => $bulkUuid]
+                )
+            );
+        }
+        $operations = $this->operationCollectionFactory->create()->addFieldToFilter('bulk_uuid', $bulkUuid)->getItems();
+        $bulk->setOperationsList($operations);
+
+        return $bulk;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getBulkShortStatus($bulkUuid)
+    {
+        $bulkSummary = $this->bulkShortFactory->create();
+
+        /** @var \Magento\AsynchronousOperations\Api\Data\BulkOperationsStatusInterface $bulk */
+        $bulk = $this->entityManager->load($bulkSummary, $bulkUuid);
+        if ($bulk->getBulkId() === null) {
+            throw new NoSuchEntityException(
+                __(
+                    'Bulk uuid %bulkUuid not exist',
+                    ['bulkUuid' => $bulkUuid]
+                )
+            );
+        }
+        $operations = $this->operationCollectionFactory->create()->addFieldToFilter('bulk_uuid', $bulkUuid)->getItems();
+        $bulk->setOperationsList($operations);
+
+        return $bulk;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/BulkStatus/CalculatedStatusSql.php b/app/code/Magento/AsynchronousOperations/Model/BulkStatus/CalculatedStatusSql.php
index dda3ed3b673..7bdf8a5b7d4 100644
--- a/app/code/Magento/AsynchronousOperations/Model/BulkStatus/CalculatedStatusSql.php
+++ b/app/code/Magento/AsynchronousOperations/Model/BulkStatus/CalculatedStatusSql.php
@@ -6,7 +6,6 @@
 
 namespace Magento\AsynchronousOperations\Model\BulkStatus;
 
-use Magento\AsynchronousOperations\Api\Data\OperationInterface;
 use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
 
 class CalculatedStatusSql
diff --git a/app/code/Magento/AsynchronousOperations/Model/BulkStatus/Detailed.php b/app/code/Magento/AsynchronousOperations/Model/BulkStatus/Detailed.php
new file mode 100644
index 00000000000..334abb33fd1
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/BulkStatus/Detailed.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Model\BulkStatus;
+
+use Magento\AsynchronousOperations\Api\Data\DetailedBulkOperationsStatusInterface;
+use Magento\AsynchronousOperations\Model\BulkSummary;
+
+class Detailed extends BulkSummary implements DetailedBulkOperationsStatusInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getOperationsList()
+    {
+        return $this->getData(self::OPERATIONS_LIST);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setOperationsList($operationStatusList)
+    {
+        return $this->setData(self::OPERATIONS_LIST, $operationStatusList);
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/BulkStatus/Short.php b/app/code/Magento/AsynchronousOperations/Model/BulkStatus/Short.php
new file mode 100644
index 00000000000..c6aa99e6720
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/BulkStatus/Short.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Model\BulkStatus;
+
+use Magento\AsynchronousOperations\Api\Data\BulkOperationsStatusInterface;
+use Magento\AsynchronousOperations\Model\BulkSummary;
+
+class Short extends BulkSummary implements BulkOperationsStatusInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getOperationsList()
+    {
+        return $this->getData(self::OPERATIONS_LIST);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setOperationsList($operationStatusList)
+    {
+        return $this->setData(self::OPERATIONS_LIST, $operationStatusList);
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/ConfigInterface.php b/app/code/Magento/AsynchronousOperations/Model/ConfigInterface.php
new file mode 100644
index 00000000000..de0f89a7165
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/ConfigInterface.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+
+/**
+ * Class for accessing to Webapi_Async configuration.
+ *
+ * @api
+ */
+interface ConfigInterface
+{
+    /**#@+
+     * Constants for Webapi Asynchronous Config generation
+     */
+    const CACHE_ID = 'webapi_async_config';
+    const TOPIC_PREFIX = 'async.';
+    const DEFAULT_CONSUMER_INSTANCE = MassConsumer::class;
+    const DEFAULT_CONSUMER_CONNECTION = 'amqp';
+    const DEFAULT_CONSUMER_MAX_MESSAGE = null;
+    const SERVICE_PARAM_KEY_INTERFACE = 'interface';
+    const SERVICE_PARAM_KEY_METHOD = 'method';
+    const SERVICE_PARAM_KEY_TOPIC = 'topic';
+    const DEFAULT_HANDLER_NAME = 'async';
+    const SYSTEM_TOPIC_NAME = 'async.system.required.wrapper.topic';
+    const SYSTEM_TOPIC_CONFIGURATION =  [
+        CommunicationConfig::TOPIC_NAME           => self::SYSTEM_TOPIC_NAME,
+        CommunicationConfig::TOPIC_IS_SYNCHRONOUS => false,
+        CommunicationConfig::TOPIC_REQUEST        => OperationInterface::class,
+        CommunicationConfig::TOPIC_REQUEST_TYPE   => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+        CommunicationConfig::TOPIC_RESPONSE       => null,
+        CommunicationConfig::TOPIC_HANDLERS       => [],
+    ];
+    /**#@-*/
+
+    /**
+     * Get array of generated topics name and related to this topic service class and methods
+     *
+     * @return array
+     */
+    public function getServices();
+
+    /**
+     * Get topic name from webapi_async_config services config array by route url and http method
+     *
+     * @param string $routeUrl
+     * @param string $httpMethod GET|POST|PUT|DELETE
+     * @return string
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function getTopicName($routeUrl, $httpMethod);
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/Entity/BulkSummaryMapper.php b/app/code/Magento/AsynchronousOperations/Model/Entity/BulkSummaryMapper.php
index 94ebbdca445..4abbde4c360 100644
--- a/app/code/Magento/AsynchronousOperations/Model/Entity/BulkSummaryMapper.php
+++ b/app/code/Magento/AsynchronousOperations/Model/Entity/BulkSummaryMapper.php
@@ -8,7 +8,6 @@
 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
diff --git a/app/code/Magento/AsynchronousOperations/Model/ItemStatus.php b/app/code/Magento/AsynchronousOperations/Model/ItemStatus.php
new file mode 100644
index 00000000000..b493e0bb663
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/ItemStatus.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\ItemStatusInterface;
+use Magento\Framework\DataObject;
+
+class ItemStatus extends DataObject implements ItemStatusInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getId()
+    {
+        return $this->getData(self::ENTITY_ID);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setId($entityId)
+    {
+        return $this->setData(self::ENTITY_ID, $entityId);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getDataHash()
+    {
+        return $this->getData(self::DATA_HASH);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setDataHash($hash)
+    {
+        return $this->setData(self::DATA_HASH, $hash);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getStatus()
+    {
+        return $this->getData(self::STATUS);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setStatus($status = self::STATUS_ACCEPTED)
+    {
+        return $this->setData(self::STATUS, $status);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getErrorMessage()
+    {
+        return $this->getData(self::ERROR_MESSAGE);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setErrorMessage($errorMessage = null)
+    {
+        if ($errorMessage instanceof \Exception) {
+            $errorMessage = $errorMessage->getMessage();
+        }
+
+        return $this->setData(self::ERROR_MESSAGE, $errorMessage);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getErrorCode()
+    {
+        return $this->getData(self::ERROR_CODE);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setErrorCode($errorCode = null)
+    {
+        if ($errorCode instanceof \Exception) {
+            $errorCode = $errorCode->getCode();
+        }
+
+        return $this->setData(self::ERROR_CODE, (int) $errorCode);
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/MassConsumer.php b/app/code/Magento/AsynchronousOperations/Model/MassConsumer.php
new file mode 100644
index 00000000000..28bc8141a8e
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/MassConsumer.php
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\Framework\App\ResourceConnection;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\MessageQueue\MessageLockException;
+use Magento\Framework\MessageQueue\ConnectionLostException;
+use Magento\Framework\Exception\NotFoundException;
+use Magento\Framework\MessageQueue\CallbackInvoker;
+use Magento\Framework\MessageQueue\ConsumerConfigurationInterface;
+use Magento\Framework\MessageQueue\EnvelopeInterface;
+use Magento\Framework\MessageQueue\QueueInterface;
+use Magento\Framework\MessageQueue\LockInterface;
+use Magento\Framework\MessageQueue\MessageController;
+use Magento\Framework\MessageQueue\ConsumerInterface;
+
+/**
+ * Class Consumer used to process OperationInterface messages.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class MassConsumer implements ConsumerInterface
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\CallbackInvoker
+     */
+    private $invoker;
+
+    /**
+     * @var \Magento\Framework\App\ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\ConsumerConfigurationInterface
+     */
+    private $configuration;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageController
+     */
+    private $messageController;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var OperationProcessor
+     */
+    private $operationProcessor;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param CallbackInvoker $invoker
+     * @param ResourceConnection $resource
+     * @param MessageController $messageController
+     * @param ConsumerConfigurationInterface $configuration
+     * @param OperationProcessorFactory $operationProcessorFactory
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        CallbackInvoker $invoker,
+        ResourceConnection $resource,
+        MessageController $messageController,
+        ConsumerConfigurationInterface $configuration,
+        OperationProcessorFactory $operationProcessorFactory,
+        LoggerInterface $logger
+    ) {
+        $this->invoker = $invoker;
+        $this->resource = $resource;
+        $this->messageController = $messageController;
+        $this->configuration = $configuration;
+        $this->operationProcessor = $operationProcessorFactory->create([
+            'configuration' => $configuration
+        ]);
+        $this->logger = $logger;
+    }
+
+    /**
+     * {@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));
+        }
+    }
+
+    /**
+     * Get transaction callback. This handles the case of 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'];
+                $lock = $this->messageController->lock($message, $this->configuration->getConsumerName());
+
+                $allowedTopics = $this->configuration->getTopicNames();
+                if (in_array($topicName, $allowedTopics)) {
+                    $this->operationProcessor->process($message->getBody());
+                } else {
+                    $queue->reject($message);
+                    return;
+                }
+                $queue->acknowledge($message);
+            } catch (MessageLockException $exception) {
+                $queue->acknowledge($message);
+            } catch (ConnectionLostException $e) {
+                if ($lock) {
+                    $this->resource->getConnection()
+                        ->delete($this->resource->getTableName('queue_lock'), ['id = ?' => $lock->getId()]);
+                }
+            } catch (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()]);
+                }
+            }
+        };
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/MassPublisher.php b/app/code/Magento/AsynchronousOperations/Model/MassPublisher.php
new file mode 100644
index 00000000000..5f0f8e28f9f
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/MassPublisher.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\Framework\MessageQueue\MessageValidator;
+use Magento\Framework\MessageQueue\MessageEncoder;
+use Magento\Framework\MessageQueue\Publisher\ConfigInterface as PublisherConfig;
+use Magento\Framework\MessageQueue\Bulk\ExchangeRepository;
+use Magento\Framework\MessageQueue\EnvelopeFactory;
+use Magento\AsynchronousOperations\Model\ConfigInterface as AsyncConfig;
+use Magento\Framework\MessageQueue\PublisherInterface;
+use Magento\Framework\MessageQueue\MessageIdGeneratorInterface;
+
+/**
+ * Class MassPublisher used for encoding topic entities to OperationInterface and publish them.
+ */
+class MassPublisher implements PublisherInterface
+{
+    /**
+     * @var \Magento\Framework\MessageQueue\Bulk\ExchangeRepository
+     */
+    private $exchangeRepository;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\EnvelopeFactory
+     */
+    private $envelopeFactory;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageEncoder
+     */
+    private $messageEncoder;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageValidator
+     */
+    private $messageValidator;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\Publisher\ConfigInterface
+     */
+    private $publisherConfig;
+
+    /**
+     * @var \Magento\Framework\MessageQueue\MessageIdGeneratorInterface
+     */
+    private $messageIdGenerator;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\MessageQueue\Bulk\ExchangeRepository $exchangeRepository
+     * @param \Magento\Framework\MessageQueue\EnvelopeFactory $envelopeFactory
+     * @param \Magento\Framework\MessageQueue\MessageEncoder $messageEncoder
+     * @param \Magento\Framework\MessageQueue\MessageValidator $messageValidator
+     * @param \Magento\Framework\MessageQueue\Publisher\ConfigInterface $publisherConfig
+     * @param \Magento\Framework\MessageQueue\MessageIdGeneratorInterface $messageIdGenerator
+     */
+    public function __construct(
+        ExchangeRepository $exchangeRepository,
+        EnvelopeFactory $envelopeFactory,
+        MessageEncoder $messageEncoder,
+        MessageValidator $messageValidator,
+        PublisherConfig $publisherConfig,
+        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(AsyncConfig::SYSTEM_TOPIC_NAME, $message);
+            $message = $this->messageEncoder->encode(AsyncConfig::SYSTEM_TOPIC_NAME, $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/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
new file mode 100644
index 00000000000..a7c3eac3490
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\Framework\DataObject\IdentityGeneratorInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\AsynchronousOperations\Api\Data\ItemStatusInterfaceFactory;
+use Magento\AsynchronousOperations\Api\Data\AsyncResponseInterface;
+use Magento\AsynchronousOperations\Api\Data\AsyncResponseInterfaceFactory;
+use Magento\AsynchronousOperations\Api\Data\ItemStatusInterface;
+use Magento\Framework\Bulk\BulkManagementInterface;
+use Magento\Framework\Exception\BulkException;
+use Psr\Log\LoggerInterface;
+use Magento\AsynchronousOperations\Model\ResourceModel\Operation\OperationRepository;
+
+/**
+ * Class MassSchedule used for adding multiple entities as Operations to Bulk Management with the status tracking
+ */
+class MassSchedule
+{
+    /**
+     * @var \Magento\Framework\DataObject\IdentityGeneratorInterface
+     */
+    private $identityService;
+
+    /**
+     * @var AsyncResponseInterfaceFactory
+     */
+    private $asyncResponseFactory;
+
+    /**
+     * @var ItemStatusInterfaceFactory
+     */
+    private $itemStatusInterfaceFactory;
+
+    /**
+     * @var \Magento\Framework\Bulk\BulkManagementInterface
+     */
+    private $bulkManagement;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var OperationRepository
+     */
+    private $operationRepository;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param IdentityGeneratorInterface $identityService
+     * @param ItemStatusInterfaceFactory $itemStatusInterfaceFactory
+     * @param AsyncResponseInterfaceFactory $asyncResponseFactory
+     * @param BulkManagementInterface $bulkManagement
+     * @param LoggerInterface $logger
+     * @param OperationRepository $operationRepository
+     */
+    public function __construct(
+        IdentityGeneratorInterface $identityService,
+        ItemStatusInterfaceFactory $itemStatusInterfaceFactory,
+        AsyncResponseInterfaceFactory $asyncResponseFactory,
+        BulkManagementInterface $bulkManagement,
+        LoggerInterface $logger,
+        OperationRepository $operationRepository
+    ) {
+        $this->identityService = $identityService;
+        $this->itemStatusInterfaceFactory = $itemStatusInterfaceFactory;
+        $this->asyncResponseFactory = $asyncResponseFactory;
+        $this->bulkManagement = $bulkManagement;
+        $this->logger = $logger;
+        $this->operationRepository = $operationRepository;
+    }
+
+    /**
+     * Schedule new bulk operation based on the list of entities
+     *
+     * @param $topicName
+     * @param $entitiesArray
+     * @param null $groupId
+     * @param null $userId
+     * @return AsyncResponseInterface
+     * @throws BulkException
+     * @throws LocalizedException
+     */
+    public function publishMass($topicName, array $entitiesArray, $groupId = null, $userId = null)
+    {
+        $bulkDescription = __('Topic %1', $topicName);
+
+        if ($groupId == null) {
+            $groupId = $this->identityService->generateId();
+
+            /** create new bulk without operations */
+            if (!$this->bulkManagement->scheduleBulk($groupId, [], $bulkDescription, $userId)) {
+                throw new LocalizedException(
+                    __('Something went wrong while processing the request.')
+                );
+            }
+        }
+
+        $operations = [];
+        $requestItems = [];
+        $bulkException = new BulkException();
+        foreach ($entitiesArray as $key => $entityParams) {
+            /** @var \Magento\WebapiAsync\Api\Data\ItemStatusInterface $requestItem */
+            $requestItem = $this->itemStatusInterfaceFactory->create();
+
+            try {
+                $operations[] = $this->operationRepository->createByTopic($topicName, $entityParams, $groupId);
+                $requestItem->setId($key);
+                $requestItem->setStatus(ItemStatusInterface::STATUS_ACCEPTED);
+                $requestItems[] = $requestItem;
+            } catch (\Exception $exception) {
+                $this->logger->error($exception);
+                $requestItem->setId($key);
+                $requestItem->setStatus(ItemStatusInterface::STATUS_REJECTED);
+                $requestItem->setErrorMessage($exception);
+                $requestItem->setErrorCode($exception);
+                $requestItems[] = $requestItem;
+                $bulkException->addException(new LocalizedException(
+                    __('Error processing %key element of input data', ['key' => $key]),
+                    $exception
+                ));
+            }
+        }
+
+        if (!$this->bulkManagement->scheduleBulk($groupId, $operations, $bulkDescription, $userId)) {
+            throw new LocalizedException(
+                __('Something went wrong while processing the request.')
+            );
+        }
+        /** @var AsyncResponseInterface $asyncResponse */
+        $asyncResponse = $this->asyncResponseFactory->create();
+        $asyncResponse->setBulkUuid($groupId);
+        $asyncResponse->setRequestItems($requestItems);
+
+        if ($bulkException->wasErrorAdded()) {
+            $asyncResponse->setErrors(true);
+            $bulkException->addData($asyncResponse);
+            throw $bulkException;
+        } else {
+            $asyncResponse->setErrors(false);
+        }
+
+        return $asyncResponse;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/Operation.php b/app/code/Magento/AsynchronousOperations/Model/Operation.php
index dbfce3ccd8b..70cc9f0ebc5 100644
--- a/app/code/Magento/AsynchronousOperations/Model/Operation.php
+++ b/app/code/Magento/AsynchronousOperations/Model/Operation.php
@@ -5,14 +5,14 @@
  */
 namespace Magento\AsynchronousOperations\Model;
 
-use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface;
 use Magento\Framework\DataObject;
 use Magento\Framework\Api\ExtensibleDataInterface;
 
 /**
  * Class Operation
  */
-class Operation extends DataObject implements OperationInterface, ExtensibleDataInterface
+class Operation extends DataObject implements DetailedOperationStatusInterface, ExtensibleDataInterface
 {
     /**
      * @inheritDoc
@@ -78,6 +78,22 @@ public function setSerializedData($serializedData)
         return $this->setData(self::SERIALIZED_DATA, $serializedData);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function getResultSerializedData()
+    {
+        return $this->getData(self::RESULT_SERIALIZED_DATA);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setResultSerializedData($resultSerializedData)
+    {
+        return $this->setData(self::RESULT_SERIALIZED_DATA, $resultSerializedData);
+    }
+
     /**
      * @inheritDoc
      */
diff --git a/app/code/Magento/AsynchronousOperations/Model/Operation/Details.php b/app/code/Magento/AsynchronousOperations/Model/Operation/Details.php
index 398934f0933..d248f9c3e92 100644
--- a/app/code/Magento/AsynchronousOperations/Model/Operation/Details.php
+++ b/app/code/Magento/AsynchronousOperations/Model/Operation/Details.php
@@ -3,9 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\AsynchronousOperations\Model\Operation;
 
 use Magento\Framework\Bulk\OperationInterface;
+use Magento\Framework\Bulk\BulkStatusInterface;
 
 class Details
 {
@@ -19,23 +21,36 @@ class Details
      */
     private $bulkStatus;
 
+    /**
+     * @var null
+     */
+    private $bulkUuid;
+
     /**
      * 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_COMPLETE             => 'operations_successful',
+        OperationInterface::STATUS_TYPE_RETRIABLY_FAILED     => 'failed_retriable',
         OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED => 'failed_not_retriable',
+        OperationInterface::STATUS_TYPE_OPEN                 => 'open',
+        OperationInterface::STATUS_TYPE_REJECTED             => 'rejected',
     ];
 
     /**
+     * Init dependencies.
+     *
      * @param \Magento\Framework\Bulk\BulkStatusInterface $bulkStatus
+     * @param null $bulkUuid
      */
     public function __construct(
-        \Magento\Framework\Bulk\BulkStatusInterface $bulkStatus
+        BulkStatusInterface $bulkStatus,
+        $bulkUuid = null
     ) {
         $this->bulkStatus = $bulkStatus;
+        $this->bulkUuid = $bulkUuid;
     }
 
     /**
@@ -47,11 +62,12 @@ public function __construct(
     public function getDetails($bulkUuid)
     {
         $details = [
-            'operations_total' => 0,
+            'operations_total'      => 0,
             'operations_successful' => 0,
-            'operations_failed' => 0,
-            'failed_retriable' => 0,
-            'failed_not_retriable' => 0,
+            'operations_failed'     => 0,
+            'failed_retriable'      => 0,
+            'failed_not_retriable'  => 0,
+            'rejected'              => 0,
         ];
 
         if (array_key_exists($bulkUuid, $this->operationCache)) {
@@ -65,13 +81,84 @@ public function getDetails($bulkUuid)
             );
         }
 
-        // 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_total'] = array_sum($details);
         $details['operations_failed'] = $details['failed_retriable'] + $details['failed_not_retriable'];
         $this->operationCache[$bulkUuid] = $details;
+
         return $details;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOperationsTotal()
+    {
+        $this->getDetails($this->bulkUuid);
+
+        return $this->operationCache[$this->bulkUuid]['operations_total'];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOpen()
+    {
+        $this->getDetails($this->bulkUuid);
+        $statusKey = $this->statusMap[OperationInterface::STATUS_TYPE_OPEN];
+
+        return $this->operationCache[$this->bulkUuid][$statusKey];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOperationsSuccessful()
+    {
+        $this->getDetails($this->bulkUuid);
+        $statusKey = $this->statusMap[OperationInterface::STATUS_TYPE_COMPLETE];
+
+        return $this->operationCache[$this->bulkUuid][$statusKey];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getTotalFailed()
+    {
+        $this->getDetails($this->bulkUuid);
+
+        return $this->operationCache[$this->bulkUuid]['operations_failed'];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFailedNotRetriable()
+    {
+        $statusKey = $this->statusMap[OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED];
+
+        return $this->operationCache[$this->bulkUuid][$statusKey];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFailedRetriable()
+    {
+        $this->getDetails($this->bulkUuid);
+        $statusKey = $this->statusMap[OperationInterface::STATUS_TYPE_RETRIABLY_FAILED];
+
+        return $this->operationCache[$this->bulkUuid][$statusKey];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getRejected()
+    {
+        $this->getDetails($this->bulkUuid);
+        $statusKey = $this->statusMap[OperationInterface::STATUS_TYPE_REJECTED];
+
+        return $this->operationCache[$this->bulkUuid][$statusKey];
+    }
 }
diff --git a/app/code/Magento/AsynchronousOperations/Model/OperationManagement.php b/app/code/Magento/AsynchronousOperations/Model/OperationManagement.php
index 54b8a767584..ce780a4ba85 100644
--- a/app/code/Magento/AsynchronousOperations/Model/OperationManagement.php
+++ b/app/code/Magento/AsynchronousOperations/Model/OperationManagement.php
@@ -6,7 +6,7 @@
 
 namespace Magento\AsynchronousOperations\Model;
 
-use Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory;
+use Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterfaceFactory;
 use Magento\Framework\EntityManager\EntityManager;
 
 /**
@@ -20,7 +20,7 @@ class OperationManagement implements \Magento\Framework\Bulk\OperationManagement
     private $entityManager;
 
     /**
-     * @var OperationInterfaceFactory
+     * @var DetailedOperationStatusInterfaceFactory
      */
     private $operationFactory;
 
@@ -33,24 +33,30 @@ class OperationManagement implements \Magento\Framework\Bulk\OperationManagement
      * OperationManagement constructor.
      *
      * @param EntityManager $entityManager
-     * @param OperationInterfaceFactory $operationFactory
+     * @param DetailedOperationStatusInterfaceFactory $operationFactory
      * @param \Psr\Log\LoggerInterface $logger
      */
     public function __construct(
         EntityManager $entityManager,
-        OperationInterfaceFactory $operationFactory,
+        DetailedOperationStatusInterfaceFactory $operationFactory,
         \Psr\Log\LoggerInterface $logger
     ) {
         $this->entityManager = $entityManager;
-        $this->operationFactory= $operationFactory;
+        $this->operationFactory = $operationFactory;
         $this->logger = $logger;
     }
     
     /**
      * @inheritDoc
      */
-    public function changeOperationStatus($operationId, $status, $errorCode = null, $message = null, $data = null)
-    {
+    public function changeOperationStatus(
+        $operationId,
+        $status,
+        $errorCode = null,
+        $message = null,
+        $data = null,
+        $resultData = null
+    ) {
         try {
             $operationEntity = $this->operationFactory->create();
             $this->entityManager->load($operationEntity, $operationId);
@@ -58,6 +64,8 @@ public function changeOperationStatus($operationId, $status, $errorCode = null,
             $operationEntity->setStatus($status);
             $operationEntity->setResultMessage($message);
             $operationEntity->setSerializedData($data);
+            $operationEntity->setResultSerializedData($resultData);
+            $operationEntity->setResultSerializedData($resultData);
             $this->entityManager->save($operationEntity);
         } catch (\Exception $exception) {
             $this->logger->critical($exception->getMessage());
diff --git a/app/code/Magento/AsynchronousOperations/Model/OperationProcessor.php b/app/code/Magento/AsynchronousOperations/Model/OperationProcessor.php
new file mode 100644
index 00000000000..6826c34fd35
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/OperationProcessor.php
@@ -0,0 +1,227 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\Framework\Bulk\OperationManagementInterface;
+use Magento\AsynchronousOperations\Model\ConfigInterface as AsyncConfig;
+use Magento\Framework\MessageQueue\MessageValidator;
+use Magento\Framework\MessageQueue\MessageEncoder;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\MessageQueue\ConsumerConfigurationInterface;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\TemporaryStateExceptionInterface;
+use Magento\Framework\DB\Adapter\ConnectionException;
+use Magento\Framework\DB\Adapter\DeadlockException;
+use Magento\Framework\DB\Adapter\LockWaitException;
+use Magento\Framework\Webapi\ServiceOutputProcessor;
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+
+/**
+ * Class OperationProcessor
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class OperationProcessor
+{
+    /**
+     * @var Json
+     */
+    private $jsonHelper;
+
+    /**
+     * @var OperationManagementInterface
+     */
+    private $operationManagement;
+
+    /**
+     * @var MessageEncoder
+     */
+    private $messageEncoder;
+
+    /**
+     * @var MessageValidator
+     */
+    private $messageValidator;
+
+    /**
+     * @var ConsumerConfigurationInterface
+     */
+    private $configuration;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var ServiceOutputProcessor
+     */
+    private $serviceOutputProcessor;
+
+    /**
+     * @var CommunicationConfig
+     */
+    private $communicationConfig;
+
+    /**
+     * OperationProcessor constructor.
+     *
+     * @param MessageValidator $messageValidator
+     * @param MessageEncoder $messageEncoder
+     * @param ConsumerConfigurationInterface $configuration
+     * @param Json $jsonHelper
+     * @param OperationManagementInterface $operationManagement
+     * @param LoggerInterface $logger
+     * @param \Magento\Framework\Webapi\ServiceOutputProcessor $serviceOutputProcessor
+     * @param \Magento\Framework\Communication\ConfigInterface $communicationConfig
+     */
+    public function __construct(
+        MessageValidator $messageValidator,
+        MessageEncoder $messageEncoder,
+        ConsumerConfigurationInterface $configuration,
+        Json $jsonHelper,
+        OperationManagementInterface $operationManagement,
+        ServiceOutputProcessor $serviceOutputProcessor,
+        CommunicationConfig $communicationConfig,
+        LoggerInterface $logger
+    ) {
+        $this->messageValidator = $messageValidator;
+        $this->messageEncoder = $messageEncoder;
+        $this->configuration = $configuration;
+        $this->jsonHelper = $jsonHelper;
+        $this->operationManagement = $operationManagement;
+        $this->logger = $logger;
+        $this->serviceOutputProcessor = $serviceOutputProcessor;
+        $this->communicationConfig = $communicationConfig;
+    }
+
+    /**
+     * Process topic-based encoded message
+     *
+     * @param string $encodedMessage
+     * @return void
+     */
+    public function process(string $encodedMessage)
+    {
+        $operation = $this->messageEncoder->decode(AsyncConfig::SYSTEM_TOPIC_NAME, $encodedMessage);
+        $this->messageValidator->validate(AsyncConfig::SYSTEM_TOPIC_NAME, $operation);
+
+        $status = OperationInterface::STATUS_TYPE_COMPLETE;
+        $errorCode = null;
+        $messages = [];
+        $topicName = $operation->getTopicName();
+        $handlers = $this->configuration->getHandlers($topicName);
+        try {
+            $data = $this->jsonHelper->unserialize($operation->getSerializedData());
+            $entityParams = $this->messageEncoder->decode($topicName, $data['meta_information']);
+            $this->messageValidator->validate($topicName, $entityParams);
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage());
+            $status = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+            $errorCode = $e->getCode();
+            $messages[] = $e->getMessage();
+        }
+
+        $outputData = null;
+        if ($errorCode === null) {
+            foreach ($handlers as $callback) {
+                $result = $this->executeHandler($callback, $entityParams);
+                $status = $result['status'];
+                $errorCode = $result['error_code'];
+                $messages = array_merge($messages, $result['messages']);
+                $outputData = $result['output_data'];
+            }
+        }
+
+        if (isset($outputData)) {
+            try {
+                $communicationConfig = $this->communicationConfig->getTopic($topicName);
+                $asyncHandler =
+                    $communicationConfig[CommunicationConfig::TOPIC_HANDLERS][AsyncConfig::DEFAULT_HANDLER_NAME];
+                $serviceClass = $asyncHandler[CommunicationConfig::HANDLER_TYPE];
+                $serviceMethod = $asyncHandler[CommunicationConfig::HANDLER_METHOD];
+                $outputData = $this->serviceOutputProcessor->process(
+                    $outputData,
+                    $serviceClass,
+                    $serviceMethod
+                );
+                $outputData = $this->jsonHelper->serialize($outputData);
+            } catch (\Exception $e) {
+                $messages[] = $e->getMessage();
+            }
+        }
+
+        $serializedData = (isset($errorCode)) ? $operation->getSerializedData() : null;
+        $this->operationManagement->changeOperationStatus(
+            $operation->getId(),
+            $status,
+            $errorCode,
+            implode('; ', $messages),
+            $serializedData,
+            $outputData
+        );
+    }
+
+    /**
+     * Execute topic handler
+     *
+     * @param $callback
+     * @param $entityParams
+     * @return array
+     */
+    private function executeHandler($callback, $entityParams)
+    {
+        $result = [
+            'status' => OperationInterface::STATUS_TYPE_COMPLETE,
+            'error_code' => null,
+            'messages' => [],
+            'output_data' => null
+        ];
+        try {
+            $result['output_data'] = call_user_func_array($callback, $entityParams);
+            $result['messages'][] = sprintf('Service execution success %s::%s', get_class($callback[0]), $callback[1]);
+        } catch (\Zend_Db_Adapter_Exception  $e) {
+            $this->logger->critical($e->getMessage());
+            if ($e instanceof LockWaitException
+                || $e instanceof DeadlockException
+                || $e instanceof ConnectionException
+            ) {
+                $result['status'] = OperationInterface::STATUS_TYPE_RETRIABLY_FAILED;
+                $result['error_code'] = $e->getCode();
+                $result['messages'][] = __($e->getMessage());
+            } else {
+                $result['status'] = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+                $result['error_code'] = $e->getCode();
+                $result['messages'][] =
+                    __('Sorry, something went wrong during product prices update. Please see log for details.');
+            }
+        } catch (NoSuchEntityException $e) {
+            $this->logger->error($e->getMessage());
+            $result['status'] = ($e instanceof TemporaryStateExceptionInterface) ?
+                OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED :
+                OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+            $result['error_code'] = $e->getCode();
+            $result['messages'][] = $e->getMessage();
+        } catch (LocalizedException $e) {
+            $this->logger->error($e->getMessage());
+            $result['status'] = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+            $result['error_code'] = $e->getCode();
+            $result['messages'][] = $e->getMessage();
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage());
+            $result['status'] = OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED;
+            $result['error_code'] = $e->getCode();
+            $result['messages'][] = $e->getMessage();
+        }
+        return $result;
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/OperationStatus.php b/app/code/Magento/AsynchronousOperations/Model/OperationStatus.php
new file mode 100644
index 00000000000..5c975bd1a9a
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/OperationStatus.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\AsynchronousOperations\Api\Data\SummaryOperationStatusInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\Api\ExtensibleDataInterface;
+
+/**
+ * Class OperationShortDetails
+ */
+class OperationStatus extends DataObject implements SummaryOperationStatusInterface, ExtensibleDataInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function getId()
+    {
+        return $this->getData(OperationInterface::ID);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getStatus()
+    {
+        return $this->getData(OperationInterface::STATUS);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getResultMessage()
+    {
+        return $this->getData(OperationInterface::RESULT_MESSAGE);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getErrorCode()
+    {
+        return $this->getData(OperationInterface::ERROR_CODE);
+    }
+}
diff --git a/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/OperationRepository.php b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/OperationRepository.php
new file mode 100644
index 00000000000..54e65cc3470
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/Model/ResourceModel/Operation/OperationRepository.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AsynchronousOperations\Model\ResourceModel\Operation;
+
+use Magento\AsynchronousOperations\Api\Data\OperationInterface;
+use Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory;
+use Magento\Framework\MessageQueue\MessageValidator;
+use Magento\Framework\MessageQueue\MessageEncoder;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\EntityManager\EntityManager;
+
+/**
+ * Create operation for list of bulk operations.
+ */
+class OperationRepository
+{
+    /**
+     * @var \Magento\AsynchronousOperations\Api\Data\OperationInterfaceFactory
+     */
+    private $operationFactory;
+
+    /**
+     * @var Json
+     */
+    private $jsonSerializer;
+
+    /**
+     * @var EntityManager
+     */
+    private $entityManager;
+
+    /**
+     * @var MessageEncoder
+     */
+    private $messageEncoder;
+
+    /**
+     * @var MessageValidator
+     */
+    private $messageValidator;
+
+    /**
+     * @param OperationInterfaceFactory $operationFactory
+     * @param EntityManager $entityManager
+     * @param MessageValidator $messageValidator
+     * @param MessageEncoder $messageEncoder
+     * @param Json $jsonSerializer
+     */
+    public function __construct(
+        OperationInterfaceFactory $operationFactory,
+        EntityManager $entityManager,
+        MessageValidator $messageValidator,
+        MessageEncoder $messageEncoder,
+        Json $jsonSerializer
+    ) {
+        $this->operationFactory = $operationFactory;
+        $this->jsonSerializer = $jsonSerializer;
+        $this->messageEncoder = $messageEncoder;
+        $this->messageValidator = $messageValidator;
+        $this->entityManager = $entityManager;
+    }
+
+    /**
+     * @param $topicName
+     * @param $entityParams
+     * @param $groupId
+     * @return mixed
+     */
+    public function createByTopic($topicName, $entityParams, $groupId)
+    {
+        $this->messageValidator->validate($topicName, $entityParams);
+        $encodedMessage = $this->messageEncoder->encode($topicName, $entityParams);
+
+        $serializedData = [
+            'entity_id'        => null,
+            'entity_link'      => '',
+            'meta_information' => $encodedMessage,
+        ];
+        $data = [
+            'data' => [
+                OperationInterface::BULK_ID         => $groupId,
+                OperationInterface::TOPIC_NAME      => $topicName,
+                OperationInterface::SERIALIZED_DATA => $this->jsonSerializer->serialize($serializedData),
+                OperationInterface::STATUS          => OperationInterface::STATUS_TYPE_OPEN,
+            ],
+        ];
+
+        /** @var \Magento\AsynchronousOperations\Api\Data\OperationInterface $operation */
+        $operation = $this->operationFactory->create($data);
+        return $this->entityManager->save($operation);
+    }
+}
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
index 76c7820fa99..8457a641ed9 100644
--- 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
@@ -143,7 +143,7 @@ private function getText($operationDetails)
             $summaryReport .= __(
                 '%1 item(s) have been successfully updated.',
                 $operationDetails['operations_successful']
-            ) ;
+            );
         }
 
         if ($operationDetails['operations_failed'] > 0) {
diff --git a/app/code/Magento/AsynchronousOperations/Model/StatusMapper.php b/app/code/Magento/AsynchronousOperations/Model/StatusMapper.php
index 3ad260cf26a..e5aee6d2f59 100644
--- a/app/code/Magento/AsynchronousOperations/Model/StatusMapper.php
+++ b/app/code/Magento/AsynchronousOperations/Model/StatusMapper.php
@@ -25,6 +25,7 @@ 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_REJECTED => BulkSummaryInterface::FINISHED_WITH_FAILURE,
             OperationInterface::STATUS_TYPE_COMPLETE => BulkSummaryInterface::FINISHED_SUCCESSFULLY,
             OperationInterface::STATUS_TYPE_OPEN => BulkSummaryInterface::IN_PROGRESS,
             BulkSummaryInterface::NOT_STARTED => BulkSummaryInterface::NOT_STARTED
@@ -47,7 +48,8 @@ public function bulkSummaryStatusToOperationStatus($bulkStatus)
         $statusMapping = [
             BulkSummaryInterface::FINISHED_WITH_FAILURE => [
                 OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED,
-                OperationInterface::STATUS_TYPE_RETRIABLY_FAILED
+                OperationInterface::STATUS_TYPE_RETRIABLY_FAILED,
+                OperationInterface::STATUS_TYPE_REJECTED
             ],
             BulkSummaryInterface::FINISHED_SUCCESSFULLY => OperationInterface::STATUS_TYPE_COMPLETE,
             BulkSummaryInterface::IN_PROGRESS => OperationInterface::STATUS_TYPE_OPEN,
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkStatusTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkStatusTest.php
index cda55161ab8..7a2f7941f9c 100644
--- a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkStatusTest.php
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/BulkStatusTest.php
@@ -54,11 +54,26 @@ class BulkStatusTest extends \PHPUnit\Framework\TestCase
      */
     private $metadataPoolMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkDetailedFactory;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $bulkShortFactory;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
     private $entityMetadataMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $entityManager;
+
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -81,6 +96,15 @@ protected function setUp()
             \Magento\AsynchronousOperations\Model\BulkStatus\CalculatedStatusSql::class
         );
         $this->metadataPoolMock = $this->createMock(\Magento\Framework\EntityManager\MetadataPool::class);
+        $this->bulkDetailedFactory = $this->createPartialMock(
+            \Magento\AsynchronousOperations\Api\Data\DetailedBulkOperationsStatusInterfaceFactory ::class,
+            ['create']
+        );
+        $this->bulkShortFactory = $this->createPartialMock(
+            \Magento\AsynchronousOperations\Api\Data\BulkOperationsStatusInterfaceFactory::class,
+            ['create']
+        );
+        $this->entityManager = $this->createMock(\Magento\Framework\EntityManager\EntityManager::class);
 
         $this->entityMetadataMock = $this->createMock(\Magento\Framework\EntityManager\EntityMetadataInterface::class);
         $this->connectionMock = $this->createMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
@@ -90,7 +114,10 @@ protected function setUp()
             $this->operationCollectionFactory,
             $this->resourceConnectionMock,
             $this->calculatedStatusSqlMock,
-            $this->metadataPoolMock
+            $this->metadataPoolMock,
+            $this->bulkDetailedFactory,
+            $this->bulkShortFactory,
+            $this->entityManager
         );
     }
 
@@ -151,12 +178,13 @@ public function getFailedOperationsByBulkIdDataProvider()
     {
         return [
             [1, [1]],
-            [null,
+            [
+                null,
                 [
                     OperationInterface::STATUS_TYPE_RETRIABLY_FAILED,
-                    OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED
-                ]
-            ]
+                    OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED,
+                ],
+            ],
         ];
     }
 
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/Operation/DetailsTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/Operation/DetailsTest.php
index 7060a48e773..f62e2b7f9d5 100644
--- a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/Operation/DetailsTest.php
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/Operation/DetailsTest.php
@@ -34,6 +34,7 @@ public function testGetDetails()
         $failedRetriable = 23;
         $failedNotRetriable = 45;
         $open = 303;
+        $rejected = 0;
 
         $expectedResult = [
             'operations_total' => $completed + $failedRetriable + $failedNotRetriable + $open,
@@ -41,6 +42,8 @@ public function testGetDetails()
             'operations_failed' => $failedRetriable + $failedNotRetriable,
             'failed_retriable' => $failedRetriable,
             'failed_not_retriable' => $failedNotRetriable,
+            'rejected' => $rejected,
+            'open' => $open,
         ];
 
         $this->bulkStatusMock->method('getOperationsCountByBulkIdAndStatus')
@@ -49,6 +52,7 @@ public function testGetDetails()
                 [$uuid, OperationInterface::STATUS_TYPE_RETRIABLY_FAILED, $failedRetriable],
                 [$uuid, OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED, $failedNotRetriable],
                 [$uuid, OperationInterface::STATUS_TYPE_OPEN, $open],
+                [$uuid, OperationInterface::STATUS_TYPE_REJECTED, $rejected],
             ]);
 
         $result = $this->model->getDetails($uuid);
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/OperationManagementTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/OperationManagementTest.php
index 32146b7b6eb..0a4e5f2f3ec 100644
--- a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/OperationManagementTest.php
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/OperationManagementTest.php
@@ -40,10 +40,11 @@ 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,
+            \Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterfaceFactory::class,
             ['create']
         );
-        $this->operationMock = $this->createMock(\Magento\AsynchronousOperations\Api\Data\OperationInterface::class);
+        $this->operationMock =
+            $this->createMock(\Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface::class);
         $this->loggerMock = $this->createMock(\Psr\Log\LoggerInterface::class);
         $this->model = new \Magento\AsynchronousOperations\Model\OperationManagement(
             $this->entityManagerMock,
diff --git a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/StatusMapperTest.php b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/StatusMapperTest.php
index 87d2bbac3ca..89fa80de363 100644
--- a/app/code/Magento/AsynchronousOperations/Test/Unit/Model/StatusMapperTest.php
+++ b/app/code/Magento/AsynchronousOperations/Test/Unit/Model/StatusMapperTest.php
@@ -73,7 +73,8 @@ public function testBulkSummaryStatusToOperationStatus()
             $this->model->bulkSummaryStatusToOperationStatus(BulkSummaryInterface::FINISHED_WITH_FAILURE),
             [
                 OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED,
-                OperationInterface::STATUS_TYPE_RETRIABLY_FAILED
+                OperationInterface::STATUS_TYPE_RETRIABLY_FAILED,
+                OperationInterface::STATUS_TYPE_REJECTED
             ]
         );
 
diff --git a/app/code/Magento/AsynchronousOperations/etc/db_schema.xml b/app/code/Magento/AsynchronousOperations/etc/db_schema.xml
index b986b98abf3..1b99ce9a280 100644
--- a/app/code/Magento/AsynchronousOperations/etc/db_schema.xml
+++ b/app/code/Magento/AsynchronousOperations/etc/db_schema.xml
@@ -37,6 +37,8 @@
                 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="blob" name="result_serialized_data" nullable="true"
+                comment="Result data (serialized) after 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"
diff --git a/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json b/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json
index 22ea2da3bd7..396e443355d 100644
--- a/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json
+++ b/app/code/Magento/AsynchronousOperations/etc/db_schema_whitelist.json
@@ -20,6 +20,7 @@
       "bulk_uuid": true,
       "topic_name": true,
       "serialized_data": true,
+      "result_serialized_data": true,
       "status": true,
       "error_code": true,
       "result_message": true
diff --git a/app/code/Magento/AsynchronousOperations/etc/di.xml b/app/code/Magento/AsynchronousOperations/etc/di.xml
index 3a4225347ee..c8fee29cd68 100644
--- a/app/code/Magento/AsynchronousOperations/etc/di.xml
+++ b/app/code/Magento/AsynchronousOperations/etc/di.xml
@@ -8,14 +8,19 @@
 <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\DetailedOperationStatusInterface" 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\AsynchronousOperations\Api\BulkStatusInterface" type="Magento\AsynchronousOperations\Model\BulkOperationsStatus" />
     <preference for="Magento\Framework\Bulk\BulkStatusInterface" type="Magento\AsynchronousOperations\Model\BulkStatus" />
     <preference for="Magento\Framework\Bulk\OperationManagementInterface" type="Magento\AsynchronousOperations\Model\OperationManagement" />
+    <preference for="Magento\AsynchronousOperations\Api\Data\SummaryOperationStatusInterface" type="Magento\AsynchronousOperations\Model\OperationStatus" />
+    <preference for="Magento\AsynchronousOperations\Api\Data\DetailedBulkOperationsStatusInterface" type="Magento\AsynchronousOperations\Model\BulkStatus\Detailed" />
+    <preference for="Magento\AsynchronousOperations\Api\Data\BulkOperationsStatusInterface" type="Magento\AsynchronousOperations\Model\BulkStatus\Short" />
     <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="Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface" xsi:type="array">
                     <item name="entityTableName" xsi:type="string">magento_operation</item>
                     <item name="identifierField" xsi:type="string">id</item>
                 </item>
@@ -74,6 +79,29 @@
             </argument>
         </arguments>
     </type>
-    <virtualType name="Magento\AsynchronousOperations\Ui\Component\DataProvider"
-                 type="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider"/>
+    <virtualType
+            name="Magento\AsynchronousOperations\Ui\Component\DataProvider"
+            type="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider"/>
+    <virtualType name="Magento\AsynchronousOperations\Model\VirtualType\PublisherPool" type="Magento\Framework\MessageQueue\PublisherPool">
+        <arguments>
+            <argument name="publishers" xsi:type="array">
+                <item name="async" xsi:type="array">
+                    <item name="amqp" xsi:type="object">Magento\AsynchronousOperations\Model\MassPublisher</item>
+                    <item name="db" xsi:type="object">Magento\AsynchronousOperations\Model\MassPublisher</item>
+                </item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="Magento\AsynchronousOperations\Model\VirtualType\BulkManagement" type="Magento\AsynchronousOperations\Model\BulkManagement">
+        <arguments>
+            <argument name="publisher" xsi:type="object">Magento\AsynchronousOperations\Model\VirtualType\PublisherPool</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\AsynchronousOperations\Model\MassSchedule">
+        <arguments>
+            <argument name="bulkManagement" xsi:type="object">Magento\AsynchronousOperations\Model\VirtualType\BulkManagement</argument>
+        </arguments>
+    </type>
+    <preference for="Magento\AsynchronousOperations\Api\Data\AsyncResponseInterface" type="Magento\AsynchronousOperations\Model\AsyncResponse" />
+    <preference for="Magento\AsynchronousOperations\Api\Data\ItemStatusInterface" type="Magento\AsynchronousOperations\Model\ItemStatus" />
 </config>
diff --git a/app/code/Magento/AsynchronousOperations/etc/webapi.xml b/app/code/Magento/AsynchronousOperations/etc/webapi.xml
new file mode 100644
index 00000000000..253dedd1c7a
--- /dev/null
+++ b/app/code/Magento/AsynchronousOperations/etc/webapi.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Webapi:etc/webapi.xsd">
+
+    <route url="/V1/bulk/:bulkUuid/detailed-status" method="GET">
+        <service class="Magento\AsynchronousOperations\Api\BulkStatusInterface" method="getBulkDetailedStatus"/>
+        <resources>
+            <resource ref="Magento_Logging::system_magento_logging_bulk_operations" />
+        </resources>
+    </route>
+
+    <route url="/V1/bulk/:bulkUuid/status" method="GET">
+        <service class="Magento\AsynchronousOperations\Api\BulkStatusInterface" method="getBulkShortStatus"/>
+        <resources>
+            <resource ref="Magento_Logging::system_magento_logging_bulk_operations" />
+        </resources>
+    </route>
+
+    <route url="/V1/bulk/:bulkUuid/operation-status/:status" method="GET">
+        <service class="Magento\AsynchronousOperations\Api\BulkStatusInterface" method="getOperationsCountByBulkIdAndStatus"/>
+        <resources>
+            <resource ref="Magento_Logging::system_magento_logging_bulk_operations" />
+        </resources>
+    </route>
+
+</routes>
diff --git a/app/code/Magento/Backend/Block/Menu.php b/app/code/Magento/Backend/Block/Menu.php
index d6bdeb4ea89..7d86497288a 100644
--- a/app/code/Magento/Backend/Block/Menu.php
+++ b/app/code/Magento/Backend/Block/Menu.php
@@ -352,7 +352,7 @@ protected function _addSubMenu($menuItem, $level, $limit, $id = null)
             return $output;
         }
         $output .= '<div class="submenu"' . ($level == 0 && isset($id) ? ' aria-labelledby="' . $id . '"' : '') . '>';
-        $colStops = null;
+        $colStops = [];
         if ($level == 0 && $limit) {
             $colStops = $this->_columnBrake($menuItem->getChildren(), $limit);
             $output .= '<strong class="submenu-title">' . $this->_getAnchorLabel($menuItem) . '</strong>';
@@ -387,7 +387,11 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
             $itemName = substr($menuId, strrpos($menuId, '::') + 2);
             $itemClass = str_replace('_', '-', strtolower($itemName));
 
-            if (count($colBrakes) && $colBrakes[$itemPosition]['colbrake'] && $itemPosition != 1) {
+            if (is_array($colBrakes)
+                && count($colBrakes)
+                && $colBrakes[$itemPosition]['colbrake']
+                && $itemPosition != 1
+            ) {
                 $output .= '</ul></li><li class="column"><ul role="menu">';
             }
 
@@ -401,7 +405,7 @@ public function renderNavigation($menu, $level = 0, $limit = 0, $colBrakes = [])
             $itemPosition++;
         }
 
-        if (count($colBrakes) && $limit) {
+        if (is_array($colBrakes) && count($colBrakes) && $limit) {
             $output = '<li class="column"><ul role="menu">' . $output . '</ul></li>';
         }
 
diff --git a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php
index 59657f38465..3d7154eb20f 100644
--- a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php
+++ b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php
@@ -27,6 +27,7 @@ public function render(\Magento\Framework\DataObject $row)
         $this->getUrl('adminhtml/*/editGroup', ['group_id' => $row->getGroupId()]) .
         '">' .
         $this->escapeHtml($row->getData($this->getColumn()->getIndex())) .
-        '</a>';
+        '</a><br />'
+        . '(' . __('Code') . ': ' . $row->getGroupCode() . ')';
     }
 }
diff --git a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php
index 23b2de683a9..9cfc8bfc526 100644
--- a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php
+++ b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php
@@ -27,6 +27,7 @@ public function render(\Magento\Framework\DataObject $row)
         $this->getUrl('adminhtml/*/editStore', ['store_id' => $row->getStoreId()]) .
         '">' .
         $this->escapeHtml($row->getData($this->getColumn()->getIndex())) .
-        '</a>';
+        '</a><br />' .
+        '(' . __('Code') . ': ' . $row->getStoreCode() . ')';
     }
 }
diff --git a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php
index 913e2c903d2..487eb4f8acf 100644
--- a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php
+++ b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php
@@ -24,6 +24,7 @@ public function render(\Magento\Framework\DataObject $row)
         $this->getUrl('adminhtml/*/editWebsite', ['website_id' => $row->getWebsiteId()]) .
         '">' .
         $this->escapeHtml($row->getData($this->getColumn()->getIndex())) .
-        '</a>';
+        '</a><br />' .
+        '(' . __('Code') . ': ' . $row->getCode() . ')';
     }
 }
diff --git a/app/code/Magento/Backend/Ui/Component/Control/DeleteButton.php b/app/code/Magento/Backend/Ui/Component/Control/DeleteButton.php
new file mode 100644
index 00000000000..3f4f3669ab7
--- /dev/null
+++ b/app/code/Magento/Backend/Ui/Component/Control/DeleteButton.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backend\Ui\Component\Control;
+
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Escaper;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
+
+/**
+ * Represents delete button with pre-configured options
+ * Provide an ability to show confirmation message on click on the "Delete" button
+ *
+ * @api
+ */
+class DeleteButton implements ButtonProviderInterface
+{
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * @var UrlInterface
+     */
+    private $urlBuilder;
+
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * @var string
+     */
+    private $confirmationMessage;
+
+    /**
+     * @var string
+     */
+    private $idFieldName;
+
+    /**
+     * @var string
+     */
+    private $deleteRoutePath;
+
+    /**
+     * @var int
+     */
+    private $sortOrder;
+
+    /**
+     * @param RequestInterface $request
+     * @param UrlInterface $urlBuilder
+     * @param Escaper $escaper
+     * @param string $confirmationMessage
+     * @param string $idFieldName
+     * @param string $deleteRoutePath
+     * @param int $sortOrder
+     */
+    public function __construct(
+        RequestInterface $request,
+        UrlInterface $urlBuilder,
+        Escaper $escaper,
+        string $confirmationMessage,
+        string $idFieldName,
+        string $deleteRoutePath,
+        int $sortOrder
+    ) {
+        $this->request = $request;
+        $this->urlBuilder = $urlBuilder;
+        $this->escaper = $escaper;
+        $this->confirmationMessage = $confirmationMessage;
+        $this->idFieldName = $idFieldName;
+        $this->deleteRoutePath = $deleteRoutePath;
+        $this->sortOrder = $sortOrder;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getButtonData()
+    {
+        $data = [];
+        $fieldId = $this->escaper->escapeJs($this->escaper->escapeHtml($this->request->getParam($this->idFieldName)));
+        if (null !== $fieldId) {
+            $url = $this->urlBuilder->getUrl($this->deleteRoutePath);
+            $escapedMessage = $this->escaper->escapeJs($this->escaper->escapeHtml($this->confirmationMessage));
+            $data = [
+                'label' => __('Delete'),
+                'class' => 'delete',
+                'on_click' => "deleteConfirm('{$escapedMessage}', '{$url}', {data:{{$this->idFieldName}:{$fieldId}}})",
+                'sort_order' => $this->sortOrder,
+            ];
+        }
+        return $data;
+    }
+}
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
index 81f38a30ebd..720bc1e5825 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml
@@ -46,9 +46,6 @@
         <input type="<?= /* @escapeNotVerified */ $element->getType() ?>" name="<?= /* @escapeNotVerified */ $element->getName() ?>" id="<?= $element->getHtmlId() ?>" value="<?= /* @escapeNotVerified */ $element->getValue() ?>" class="input-text <?= /* @escapeNotVerified */ $element->getClass() ?>" title="<?= /* @escapeNotVerified */ $element->getTitle() ?>"/>
     </span>
       <?php break;
-    case 'hidden': ?>
-        <input type="<?= /* @escapeNotVerified */ $element->getType() ?>" name="<?= /* @escapeNotVerified */ $element->getName() ?>" id="<?= $element->getHtmlId() ?>" value="<?= /* @escapeNotVerified */ $element->getValue() ?>">
-      <?php break;
     case 'radios': ?>
     <span class="form_row">
         <label for="<?= $element->getHtmlId() ?>"><?= /* @escapeNotVerified */ $element->getLabel() ?>:</label>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
index c99759a60d1..c665c1095a5 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml
@@ -19,7 +19,7 @@
  *
  */
 /* @var $block \Magento\Backend\Block\Widget\Grid */
-$numColumns = sizeof($block->getColumns());
+$numColumns = !is_null($block->getColumns()) ? sizeof($block->getColumns()) : 0;
 ?>
 <?php if ($block->getCollection()): ?>
 
diff --git a/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html b/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
index 891ad48b33e..fe30ca7e83f 100644
--- a/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
+++ b/app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html
@@ -5,7 +5,7 @@
  */
 -->
 
-<div class="admin__field-complex" if="element.addButton">
+<div class="admin__field-complex" if="$data.addButton">
     <div class="admin__field-complex-title">
         <span class="label" translate="'User Agent Rules'"></span>
     </div>
@@ -27,10 +27,10 @@
 <div class="admin__field admin__field-wide"
      visible="visible"
      disabled="disabled"
-     css="element.setClasses(element)"
+     css="$data.setClasses($data)"
      attr="'data-index': index">
-    <label if="element.label" class="admin__field-label" attr="for: element.uid">
-        <span translate="element.label"/>
+    <label if="$data.label" class="admin__field-label" attr="for: $data.uid">
+        <span translate="$data.label"/>
     </label>
 
     <div class="admin__field-control" data-role="grid-wrapper">
diff --git a/app/code/Magento/Braintree/Block/Form.php b/app/code/Magento/Braintree/Block/Form.php
index f6cf62f5a21..8a727ae8726 100644
--- a/app/code/Magento/Braintree/Block/Form.php
+++ b/app/code/Magento/Braintree/Block/Form.php
@@ -9,7 +9,6 @@
 use Magento\Braintree\Gateway\Config\Config as GatewayConfig;
 use Magento\Braintree\Model\Adminhtml\Source\CcType;
 use Magento\Braintree\Model\Ui\ConfigProvider;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Element\Template\Context;
 use Magento\Payment\Block\Form\Cc;
 use Magento\Payment\Helper\Data;
@@ -21,7 +20,6 @@
  */
 class Form extends Cc
 {
-
     /**
      * @var Quote
      */
@@ -48,6 +46,7 @@ class Form extends Cc
      * @param Quote $sessionQuote
      * @param GatewayConfig $gatewayConfig
      * @param CcType $ccType
+     * @param Data $paymentDataHelper
      * @param array $data
      */
     public function __construct(
@@ -56,12 +55,14 @@ public function __construct(
         Quote $sessionQuote,
         GatewayConfig $gatewayConfig,
         CcType $ccType,
+        Data $paymentDataHelper,
         array $data = []
     ) {
         parent::__construct($context, $paymentConfig, $data);
         $this->sessionQuote = $sessionQuote;
         $this->gatewayConfig = $gatewayConfig;
         $this->ccType = $ccType;
+        $this->paymentDataHelper = $paymentDataHelper;
     }
 
     /**
@@ -81,7 +82,7 @@ public function getCcAvailableTypes()
      */
     public function useCvv()
     {
-        return $this->gatewayConfig->isCvvEnabled();
+        return $this->gatewayConfig->isCvvEnabled($this->sessionQuote->getStoreId());
     }
 
     /**
@@ -90,9 +91,8 @@ public function useCvv()
      */
     public function isVaultEnabled()
     {
-        $storeId = $this->_storeManager->getStore()->getId();
         $vaultPayment = $this->getVaultPayment();
-        return $vaultPayment->isActive($storeId);
+        return $vaultPayment->isActive($this->sessionQuote->getStoreId());
     }
 
     /**
@@ -102,7 +102,10 @@ public function isVaultEnabled()
     private function getConfiguredCardTypes()
     {
         $types = $this->ccType->getCcTypeLabelMap();
-        $configCardTypes = array_fill_keys($this->gatewayConfig->getAvailableCardTypes(), '');
+        $configCardTypes = array_fill_keys(
+            $this->gatewayConfig->getAvailableCardTypes($this->sessionQuote->getStoreId()),
+            ''
+        );
 
         return array_intersect_key($types, $configCardTypes);
     }
@@ -116,7 +119,11 @@ private function getConfiguredCardTypes()
     private function filterCardTypesForCountry(array $configCardTypes, $countryId)
     {
         $filtered = $configCardTypes;
-        $countryCardTypes = $this->gatewayConfig->getCountryAvailableCardTypes($countryId);
+        $countryCardTypes = $this->gatewayConfig->getCountryAvailableCardTypes(
+            $countryId,
+            $this->sessionQuote->getStoreId()
+        );
+
         // filter card types only if specific card types are set for country
         if (!empty($countryCardTypes)) {
             $availableTypes = array_fill_keys($countryCardTypes, '');
@@ -131,19 +138,6 @@ private function filterCardTypesForCountry(array $configCardTypes, $countryId)
      */
     private function getVaultPayment()
     {
-        return $this->getPaymentDataHelper()->getMethodInstance(ConfigProvider::CC_VAULT_CODE);
-    }
-
-    /**
-     * Get payment data helper instance
-     * @return Data
-     * @deprecated 100.1.0
-     */
-    private function getPaymentDataHelper()
-    {
-        if ($this->paymentDataHelper === null) {
-            $this->paymentDataHelper = ObjectManager::getInstance()->get(Data::class);
-        }
-        return $this->paymentDataHelper;
+        return $this->paymentDataHelper->getMethodInstance(ConfigProvider::CC_VAULT_CODE);
     }
 }
diff --git a/app/code/Magento/Braintree/Block/Payment.php b/app/code/Magento/Braintree/Block/Payment.php
index 8e05856d9b5..1ba2f862e2f 100644
--- a/app/code/Magento/Braintree/Block/Payment.php
+++ b/app/code/Magento/Braintree/Block/Payment.php
@@ -48,6 +48,10 @@ public function getPaymentConfig()
         $payment = $this->config->getConfig()['payment'];
         $config = $payment[$this->getCode()];
         $config['code'] = $this->getCode();
+        $config['clientTokenUrl'] = $this->_urlBuilder->getUrl(
+            'braintree/payment/getClientToken',
+            ['_secure' => true]
+        );
         return json_encode($config, JSON_UNESCAPED_SLASHES);
     }
 
diff --git a/app/code/Magento/Braintree/Controller/Adminhtml/Payment/GetClientToken.php b/app/code/Magento/Braintree/Controller/Adminhtml/Payment/GetClientToken.php
new file mode 100644
index 00000000000..4b9721a693f
--- /dev/null
+++ b/app/code/Magento/Braintree/Controller/Adminhtml/Payment/GetClientToken.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Controller\Adminhtml\Payment;
+
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\Session\Quote;
+use Magento\Braintree\Gateway\Config\Config;
+use Magento\Braintree\Gateway\Request\PaymentDataBuilder;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
+use Magento\Framework\Controller\ResultFactory;
+
+/**
+ * Retrieves client token.
+ */
+class GetClientToken extends Action
+{
+    const ADMIN_RESOURCE = 'Magento_Braintree::get_client_token';
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var BraintreeAdapterFactory
+     */
+    private $adapterFactory;
+
+    /**
+     * @var Quote
+     */
+    private $quoteSession;
+
+    /**
+     * @param Context $context
+     * @param Config $config
+     * @param BraintreeAdapterFactory $adapterFactory
+     * @param Quote $quoteSession
+     */
+    public function __construct(
+        Context $context,
+        Config $config,
+        BraintreeAdapterFactory $adapterFactory,
+        Quote $quoteSession
+    ) {
+        parent::__construct($context);
+        $this->config = $config;
+        $this->adapterFactory = $adapterFactory;
+        $this->quoteSession = $quoteSession;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute()
+    {
+        $params = [];
+        $response = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+
+        $storeId = $this->quoteSession->getStoreId();
+        $merchantAccountId = $this->config->getMerchantAccountId($storeId);
+        if (!empty($merchantAccountId)) {
+            $params[PaymentDataBuilder::MERCHANT_ACCOUNT_ID] = $merchantAccountId;
+        }
+
+        $clientToken = $this->adapterFactory->create($storeId)
+            ->generate($params);
+        $response->setData(['clientToken' => $clientToken]);
+
+        return $response;
+    }
+}
diff --git a/app/code/Magento/Braintree/Controller/Payment/GetNonce.php b/app/code/Magento/Braintree/Controller/Payment/GetNonce.php
index aecde869ca1..f8b152ded15 100644
--- a/app/code/Magento/Braintree/Controller/Payment/GetNonce.php
+++ b/app/code/Magento/Braintree/Controller/Payment/GetNonce.php
@@ -62,7 +62,10 @@ public function execute()
         try {
             $publicHash = $this->getRequest()->getParam('public_hash');
             $customerId = $this->session->getCustomerId();
-            $result = $this->command->execute(['public_hash' => $publicHash, 'customer_id' => $customerId])->get();
+            $result = $this->command->execute(
+                ['public_hash' => $publicHash, 'customer_id' => $customerId, 'store_id' => $this->session->getStoreId()]
+            )
+                ->get();
             $response->setData(['paymentMethodNonce' => $result['paymentMethodNonce']]);
         } catch (\Exception $e) {
             $this->logger->critical($e);
diff --git a/app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php b/app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php
index f972eecf9f9..de439aad2de 100644
--- a/app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php
+++ b/app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php
@@ -6,18 +6,19 @@
 namespace Magento\Braintree\Gateway\Command;
 
 use Braintree\Transaction;
-use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
 use Magento\Braintree\Model\Adapter\BraintreeSearchAdapter;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
-use Magento\Payment\Gateway\Command;
 use Magento\Payment\Gateway\Command\CommandPoolInterface;
 use Magento\Payment\Gateway\CommandInterface;
+use Magento\Payment\Gateway\Data\OrderAdapterInterface;
 use Magento\Payment\Gateway\Helper\ContextHelper;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
-use Magento\Sales\Api\TransactionRepositoryInterface;
 use Magento\Sales\Api\Data\TransactionInterface;
+use Magento\Sales\Api\TransactionRepositoryInterface;
+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 
 /**
  * Class CaptureStrategyCommand
@@ -66,9 +67,9 @@ class CaptureStrategyCommand implements CommandInterface
     private $subjectReader;
 
     /**
-     * @var BraintreeAdapter
+     * @var BraintreeAdapterFactory
      */
-    private $braintreeAdapter;
+    private $braintreeAdapterFactory;
 
     /**
      * @var BraintreeSearchAdapter
@@ -83,7 +84,7 @@ class CaptureStrategyCommand implements CommandInterface
      * @param FilterBuilder $filterBuilder
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param SubjectReader $subjectReader
-     * @param BraintreeAdapter $braintreeAdapter
+     * @param BraintreeAdapterFactory $braintreeAdapterFactory,
      * @param BraintreeSearchAdapter $braintreeSearchAdapter
      */
     public function __construct(
@@ -92,7 +93,7 @@ public function __construct(
         FilterBuilder $filterBuilder,
         SearchCriteriaBuilder $searchCriteriaBuilder,
         SubjectReader $subjectReader,
-        BraintreeAdapter $braintreeAdapter,
+        BraintreeAdapterFactory $braintreeAdapterFactory,
         BraintreeSearchAdapter $braintreeSearchAdapter
     ) {
         $this->commandPool = $commandPool;
@@ -100,7 +101,7 @@ public function __construct(
         $this->filterBuilder = $filterBuilder;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->subjectReader = $subjectReader;
-        $this->braintreeAdapter = $braintreeAdapter;
+        $this->braintreeAdapterFactory = $braintreeAdapterFactory;
         $this->braintreeSearchAdapter = $braintreeSearchAdapter;
     }
 
@@ -112,29 +113,29 @@ public function execute(array $commandSubject)
         /** @var \Magento\Payment\Gateway\Data\PaymentDataObjectInterface $paymentDO */
         $paymentDO = $this->subjectReader->readPayment($commandSubject);
 
-        /** @var \Magento\Sales\Api\Data\OrderPaymentInterface $paymentInfo */
-        $paymentInfo = $paymentDO->getPayment();
-        ContextHelper::assertOrderPayment($paymentInfo);
-
-        $command = $this->getCommand($paymentInfo);
+        $command = $this->getCommand($paymentDO);
         $this->commandPool->get($command)->execute($commandSubject);
     }
 
     /**
-     * Get execution command name
-     * @param OrderPaymentInterface $payment
+     * Get execution command name.
+     *
+     * @param PaymentDataObjectInterface $paymentDO
      * @return string
      */
-    private function getCommand(OrderPaymentInterface $payment)
+    private function getCommand(PaymentDataObjectInterface $paymentDO)
     {
-        // if auth transaction is not exists execute authorize&capture command
+        $payment = $paymentDO->getPayment();
+        ContextHelper::assertOrderPayment($payment);
+
+        // if auth transaction does not exist then execute authorize&capture command
         $existsCapture = $this->isExistsCaptureTransaction($payment);
         if (!$payment->getAuthorizationTransaction() && !$existsCapture) {
             return self::SALE;
         }
 
         // do capture for authorization transaction
-        if (!$existsCapture && !$this->isExpiredAuthorization($payment)) {
+        if (!$existsCapture && !$this->isExpiredAuthorization($payment, $paymentDO->getOrder())) {
             return self::CAPTURE;
         }
 
@@ -143,12 +144,16 @@ private function getCommand(OrderPaymentInterface $payment)
     }
 
     /**
+     * Checks if authorization transaction does not expired yet.
+     *
      * @param OrderPaymentInterface $payment
-     * @return boolean
+     * @param OrderAdapterInterface $orderAdapter
+     * @return bool
      */
-    private function isExpiredAuthorization(OrderPaymentInterface $payment)
+    private function isExpiredAuthorization(OrderPaymentInterface $payment, OrderAdapterInterface $orderAdapter)
     {
-        $collection = $this->braintreeAdapter->search(
+        $adapter = $this->braintreeAdapterFactory->create($orderAdapter->getStoreId());
+        $collection = $adapter->search(
             [
                 $this->braintreeSearchAdapter->id()->is($payment->getLastTransId()),
                 $this->braintreeSearchAdapter->status()->is(Transaction::AUTHORIZATION_EXPIRED)
diff --git a/app/code/Magento/Braintree/Gateway/Command/GetPaymentNonceCommand.php b/app/code/Magento/Braintree/Gateway/Command/GetPaymentNonceCommand.php
index 13a1762d5cb..672aa02a0db 100644
--- a/app/code/Magento/Braintree/Gateway/Command/GetPaymentNonceCommand.php
+++ b/app/code/Magento/Braintree/Gateway/Command/GetPaymentNonceCommand.php
@@ -6,11 +6,9 @@
 
 namespace Magento\Braintree\Gateway\Command;
 
-use Exception;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Validator\PaymentNonceResponseValidator;
-use Magento\Braintree\Model\Adapter\BraintreeAdapter;
-use Magento\Payment\Gateway\Command;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
 use Magento\Payment\Gateway\Command\Result\ArrayResultFactory;
 use Magento\Payment\Gateway\CommandInterface;
 use Magento\Vault\Api\PaymentTokenManagementInterface;
@@ -27,9 +25,9 @@ class GetPaymentNonceCommand implements CommandInterface
     private $tokenManagement;
 
     /**
-     * @var BraintreeAdapter
+     * @var BraintreeAdapterFactory
      */
-    private $adapter;
+    private $adapterFactory;
 
     /**
      * @var ArrayResultFactory
@@ -48,20 +46,20 @@ class GetPaymentNonceCommand implements CommandInterface
 
     /**
      * @param PaymentTokenManagementInterface $tokenManagement
-     * @param BraintreeAdapter $adapter
+     * @param BraintreeAdapterFactory $adapterFactory
      * @param ArrayResultFactory $resultFactory
      * @param SubjectReader $subjectReader
      * @param PaymentNonceResponseValidator $responseValidator
      */
     public function __construct(
         PaymentTokenManagementInterface $tokenManagement,
-        BraintreeAdapter $adapter,
+        BraintreeAdapterFactory $adapterFactory,
         ArrayResultFactory $resultFactory,
         SubjectReader $subjectReader,
         PaymentNonceResponseValidator $responseValidator
     ) {
         $this->tokenManagement = $tokenManagement;
-        $this->adapter = $adapter;
+        $this->adapterFactory = $adapterFactory;
         $this->resultFactory = $resultFactory;
         $this->subjectReader = $subjectReader;
         $this->responseValidator = $responseValidator;
@@ -77,14 +75,16 @@ public function execute(array $commandSubject)
         $customerId = $this->subjectReader->readCustomerId($commandSubject);
         $paymentToken = $this->tokenManagement->getByPublicHash($publicHash, $customerId);
         if (!$paymentToken) {
-            throw new Exception('No payment tokens are available.');
+            throw new \Exception('No available payment tokens');
         }
 
-        $data = $this->adapter->createNonce($paymentToken->getGatewayToken());
+        $storeId = $this->subjectReader->readStoreId($commandSubject);
+        $data = $this->adapterFactory->create($storeId)
+            ->createNonce($paymentToken->getGatewayToken());
         $result = $this->responseValidator->validate(['response' => ['object' => $data]]);
 
         if (!$result->isValid()) {
-            throw new Exception(__(implode("\n", $result->getFailsDescription())));
+            throw new \Exception(__(implode("\n", $result->getFailsDescription())));
         }
 
         return $this->resultFactory->create(['array' => ['paymentMethodNonce' => $data->paymentMethodNonce->nonce]]);
diff --git a/app/code/Magento/Braintree/Gateway/Config/CanVoidHandler.php b/app/code/Magento/Braintree/Gateway/Config/CanVoidHandler.php
index 9dd52dc91af..0466216bdb7 100644
--- a/app/code/Magento/Braintree/Gateway/Config/CanVoidHandler.php
+++ b/app/code/Magento/Braintree/Gateway/Config/CanVoidHandler.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Braintree\Gateway\Config;
 
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Config\ValueHandlerInterface;
 use Magento\Sales\Model\Order\Payment;
 
diff --git a/app/code/Magento/Braintree/Gateway/Config/Config.php b/app/code/Magento/Braintree/Gateway/Config/Config.php
index 7badd2b87ac..2089a9646ae 100644
--- a/app/code/Magento/Braintree/Gateway/Config/Config.php
+++ b/app/code/Magento/Braintree/Gateway/Config/Config.php
@@ -68,11 +68,12 @@ public function __construct(
     /**
      * Return the country specific card type config
      *
+     * @param int|null $storeId
      * @return array
      */
-    public function getCountrySpecificCardTypeConfig()
+    public function getCountrySpecificCardTypeConfig($storeId = null)
     {
-        $countryCardTypes = $this->getValue(self::KEY_COUNTRY_CREDIT_CARD);
+        $countryCardTypes = $this->getValue(self::KEY_COUNTRY_CREDIT_CARD, $storeId);
         if (!$countryCardTypes) {
             return [];
         }
@@ -83,11 +84,12 @@ public function getCountrySpecificCardTypeConfig()
     /**
      * Retrieve available credit card types
      *
+     * @param int|null $storeId
      * @return array
      */
-    public function getAvailableCardTypes()
+    public function getAvailableCardTypes($storeId = null)
     {
-        $ccTypes = $this->getValue(self::KEY_CC_TYPES);
+        $ccTypes = $this->getValue(self::KEY_CC_TYPES, $storeId);
 
         return !empty($ccTypes) ? explode(',', $ccTypes) : [];
     }
@@ -108,79 +110,110 @@ public function getCcTypesMapper()
     }
 
     /**
-     * Get list of card types available for country
+     * Gets list of card types available for country.
+     *
      * @param string $country
+     * @param int|null $storeId
      * @return array
      */
-    public function getCountryAvailableCardTypes($country)
+    public function getCountryAvailableCardTypes($country, $storeId = null)
     {
-        $types = $this->getCountrySpecificCardTypeConfig();
+        $types = $this->getCountrySpecificCardTypeConfig($storeId);
 
         return (!empty($types[$country])) ? $types[$country] : [];
     }
 
     /**
-     * Check if cvv field is enabled
-     * @return boolean
+     * Checks if cvv field is enabled.
+     *
+     * @param int|null $storeId
+     * @return bool
      */
-    public function isCvvEnabled()
+    public function isCvvEnabled($storeId = null)
     {
-        return (bool) $this->getValue(self::KEY_USE_CVV);
+        return (bool) $this->getValue(self::KEY_USE_CVV, $storeId);
     }
 
     /**
-     * Check if 3d secure verification enabled
+     * Checks if 3d secure verification enabled.
+     *
+     * @param int|null $storeId
      * @return bool
      */
-    public function isVerify3DSecure()
+    public function isVerify3DSecure($storeId = null)
     {
-        return (bool) $this->getValue(self::KEY_VERIFY_3DSECURE);
+        return (bool) $this->getValue(self::KEY_VERIFY_3DSECURE, $storeId);
     }
 
     /**
-     * Get threshold amount for 3d secure
+     * Gets threshold amount for 3d secure.
+     *
+     * @param int|null $storeId
      * @return float
      */
-    public function getThresholdAmount()
+    public function getThresholdAmount($storeId = null)
     {
-        return (double) $this->getValue(self::KEY_THRESHOLD_AMOUNT);
+        return (double) $this->getValue(self::KEY_THRESHOLD_AMOUNT, $storeId);
     }
 
     /**
-     * Get list of specific countries for 3d secure
+     * Gets list of specific countries for 3d secure.
+     *
+     * @param int|null $storeId
      * @return array
      */
-    public function get3DSecureSpecificCountries()
+    public function get3DSecureSpecificCountries($storeId = null)
     {
-        if ((int) $this->getValue(self::KEY_VERIFY_ALLOW_SPECIFIC) == self::VALUE_3DSECURE_ALL) {
+        if ((int) $this->getValue(self::KEY_VERIFY_ALLOW_SPECIFIC, $storeId) == self::VALUE_3DSECURE_ALL) {
             return [];
         }
 
-        return explode(',', $this->getValue(self::KEY_VERIFY_SPECIFIC));
+        return explode(',', $this->getValue(self::KEY_VERIFY_SPECIFIC, $storeId));
+    }
+
+    /**
+     * Gets value of configured environment.
+     * Possible values: production or sandbox.
+     *
+     * @param int|null $storeId
+     * @return string
+     */
+    public function getEnvironment($storeId = null)
+    {
+        return $this->getValue(Config::KEY_ENVIRONMENT, $storeId);
     }
 
     /**
+     * Gets Kount merchant ID.
+     *
+     * @param int|null $storeId
      * @return string
      */
-    public function getEnvironment()
+    public function getKountMerchantId($storeId = null)
     {
-        return $this->getValue(Config::KEY_ENVIRONMENT);
+        return $this->getValue(Config::KEY_KOUNT_MERCHANT_ID, $storeId);
     }
 
     /**
+     * Gets merchant ID.
+     *
+     * @param int|null $storeId
      * @return string
      */
-    public function getKountMerchantId()
+    public function getMerchantId($storeId = null)
     {
-        return $this->getValue(Config::KEY_KOUNT_MERCHANT_ID);
+        return $this->getValue(Config::KEY_MERCHANT_ID, $storeId);
     }
 
     /**
+     * Gets Merchant account ID.
+     *
+     * @param int|null $storeId
      * @return string
      */
-    public function getMerchantId()
+    public function getMerchantAccountId($storeId = null)
     {
-        return $this->getValue(Config::KEY_MERCHANT_ID);
+        return $this->getValue(self::KEY_MERCHANT_ACCOUNT_ID, $storeId);
     }
 
     /**
@@ -192,45 +225,42 @@ public function getSdkUrl()
     }
 
     /**
+     * Checks if fraud protection is enabled.
+     *
+     * @param int|null $storeId
      * @return bool
      */
-    public function hasFraudProtection()
+    public function hasFraudProtection($storeId = null)
     {
-        return (bool) $this->getValue(Config::FRAUD_PROTECTION);
+        return (bool) $this->getValue(Config::FRAUD_PROTECTION, $storeId);
     }
 
     /**
-     * Get Payment configuration status
+     * Gets Payment configuration status.
+     *
+     * @param int|null $storeId
      * @return bool
      */
-    public function isActive()
+    public function isActive($storeId = null)
     {
-        return (bool) $this->getValue(self::KEY_ACTIVE);
+        return (bool) $this->getValue(self::KEY_ACTIVE, $storeId);
     }
 
     /**
-     * Get list of configured dynamic descriptors
+     * Gets list of configured dynamic descriptors.
+     *
+     * @param int|null $storeId
      * @return array
      */
-    public function getDynamicDescriptors()
+    public function getDynamicDescriptors($storeId = null)
     {
         $values = [];
         foreach (self::$dynamicDescriptorKeys as $key) {
-            $value = $this->getValue('descriptor_' . $key);
+            $value = $this->getValue('descriptor_' . $key, $storeId);
             if (!empty($value)) {
                 $values[$key] = $value;
             }
         }
         return $values;
     }
-
-    /**
-     * Get Merchant account ID
-     *
-     * @return string
-     */
-    public function getMerchantAccountId()
-    {
-        return $this->getValue(self::KEY_MERCHANT_ACCOUNT_ID);
-    }
 }
diff --git a/app/code/Magento/Braintree/Gateway/Http/Client/AbstractTransaction.php b/app/code/Magento/Braintree/Gateway/Http/Client/AbstractTransaction.php
index caeaaa7fe45..ef35152bf7e 100644
--- a/app/code/Magento/Braintree/Gateway/Http/Client/AbstractTransaction.php
+++ b/app/code/Magento/Braintree/Gateway/Http/Client/AbstractTransaction.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Braintree\Gateway\Http\Client;
 
-use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
 use Magento\Payment\Gateway\Http\ClientException;
 use Magento\Payment\Gateway\Http\ClientInterface;
 use Magento\Payment\Gateway\Http\TransferInterface;
@@ -29,22 +29,22 @@ abstract class AbstractTransaction implements ClientInterface
     protected $customLogger;
 
     /**
-     * @var BraintreeAdapter
+     * @var BraintreeAdapterFactory
      */
-    protected $adapter;
+    protected $adapterFactory;
 
     /**
      * Constructor
      *
      * @param LoggerInterface $logger
      * @param Logger $customLogger
-     * @param BraintreeAdapter $transaction
+     * @param BraintreeAdapterFactory $adapterFactory
      */
-    public function __construct(LoggerInterface $logger, Logger $customLogger, BraintreeAdapter $adapter)
+    public function __construct(LoggerInterface $logger, Logger $customLogger, BraintreeAdapterFactory $adapterFactory)
     {
         $this->logger = $logger;
         $this->customLogger = $customLogger;
-        $this->adapter = $adapter;
+        $this->adapterFactory = $adapterFactory;
     }
 
     /**
diff --git a/app/code/Magento/Braintree/Gateway/Http/Client/TransactionRefund.php b/app/code/Magento/Braintree/Gateway/Http/Client/TransactionRefund.php
index 180344ab726..4c3f1e179d3 100644
--- a/app/code/Magento/Braintree/Gateway/Http/Client/TransactionRefund.php
+++ b/app/code/Magento/Braintree/Gateway/Http/Client/TransactionRefund.php
@@ -16,9 +16,11 @@ class TransactionRefund extends AbstractTransaction
      */
     protected function process(array $data)
     {
-        return $this->adapter->refund(
-            $data['transaction_id'],
-            $data[PaymentDataBuilder::AMOUNT]
-        );
+        $storeId = $data['store_id'] ?? null;
+        // sending store id and other additional keys are restricted by Braintree API
+        unset($data['store_id']);
+
+        return $this->adapterFactory->create($storeId)
+            ->refund($data['transaction_id'], $data[PaymentDataBuilder::AMOUNT]);
     }
 }
diff --git a/app/code/Magento/Braintree/Gateway/Http/Client/TransactionSale.php b/app/code/Magento/Braintree/Gateway/Http/Client/TransactionSale.php
index 81c79e52290..0e4481a43bc 100644
--- a/app/code/Magento/Braintree/Gateway/Http/Client/TransactionSale.php
+++ b/app/code/Magento/Braintree/Gateway/Http/Client/TransactionSale.php
@@ -15,6 +15,10 @@ class TransactionSale extends AbstractTransaction
      */
     protected function process(array $data)
     {
-        return $this->adapter->sale($data);
+        $storeId = $data['store_id'] ?? null;
+        // sending store id and other additional keys are restricted by Braintree API
+        unset($data['store_id']);
+
+        return $this->adapterFactory->create($storeId)->sale($data);
     }
 }
diff --git a/app/code/Magento/Braintree/Gateway/Http/Client/TransactionSubmitForSettlement.php b/app/code/Magento/Braintree/Gateway/Http/Client/TransactionSubmitForSettlement.php
index 0df5799b54b..16ebd7a7a00 100644
--- a/app/code/Magento/Braintree/Gateway/Http/Client/TransactionSubmitForSettlement.php
+++ b/app/code/Magento/Braintree/Gateway/Http/Client/TransactionSubmitForSettlement.php
@@ -18,9 +18,11 @@ class TransactionSubmitForSettlement extends AbstractTransaction
      */
     protected function process(array $data)
     {
-        return  $this->adapter->submitForSettlement(
-            $data[CaptureDataBuilder::TRANSACTION_ID],
-            $data[PaymentDataBuilder::AMOUNT]
-        );
+        $storeId = $data['store_id'] ?? null;
+        // sending store id and other additional keys are restricted by Braintree API
+        unset($data['store_id']);
+
+        return  $this->adapterFactory->create($storeId)
+            ->submitForSettlement($data[CaptureDataBuilder::TRANSACTION_ID], $data[PaymentDataBuilder::AMOUNT]);
     }
 }
diff --git a/app/code/Magento/Braintree/Gateway/Http/Client/TransactionVoid.php b/app/code/Magento/Braintree/Gateway/Http/Client/TransactionVoid.php
index a774065365b..e9a478a8bac 100644
--- a/app/code/Magento/Braintree/Gateway/Http/Client/TransactionVoid.php
+++ b/app/code/Magento/Braintree/Gateway/Http/Client/TransactionVoid.php
@@ -14,6 +14,10 @@ class TransactionVoid extends AbstractTransaction
      */
     protected function process(array $data)
     {
-        return $this->adapter->void($data['transaction_id']);
+        $storeId = $data['store_id'] ?? null;
+        // sending store id and other additional keys are restricted by Braintree API
+        unset($data['store_id']);
+
+        return $this->adapterFactory->create($storeId)->void($data['transaction_id']);
     }
 }
diff --git a/app/code/Magento/Braintree/Gateway/Request/AddressDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/AddressDataBuilder.php
index 9ff65149894..f7d3aae823e 100644
--- a/app/code/Magento/Braintree/Gateway/Request/AddressDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/AddressDataBuilder.php
@@ -6,7 +6,7 @@
 namespace Magento\Braintree\Gateway\Request;
 
 use Magento\Payment\Gateway\Request\BuilderInterface;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 
 /**
  * Class AddressDataBuilder
diff --git a/app/code/Magento/Braintree/Gateway/Request/CaptureDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/CaptureDataBuilder.php
index c6588cfaca0..6f3a262d7ef 100644
--- a/app/code/Magento/Braintree/Gateway/Request/CaptureDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/CaptureDataBuilder.php
@@ -6,7 +6,7 @@
 namespace Magento\Braintree\Gateway\Request;
 
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Request\BuilderInterface;
 use Magento\Payment\Helper\Formatter;
 
diff --git a/app/code/Magento/Braintree/Gateway/Request/CustomerDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/CustomerDataBuilder.php
index 6b03f418c25..6b3403bcd15 100644
--- a/app/code/Magento/Braintree/Gateway/Request/CustomerDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/CustomerDataBuilder.php
@@ -6,7 +6,7 @@
 namespace Magento\Braintree\Gateway\Request;
 
 use Magento\Payment\Gateway\Request\BuilderInterface;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 
 /**
  * Class CustomerDataBuilder
diff --git a/app/code/Magento/Braintree/Gateway/Request/DescriptorDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/DescriptorDataBuilder.php
index 3794058c2be..aac603bfb62 100644
--- a/app/code/Magento/Braintree/Gateway/Request/DescriptorDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/DescriptorDataBuilder.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Braintree\Gateway\Request;
 
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Request\BuilderInterface;
 use Magento\Braintree\Gateway\Config\Config;
 
@@ -24,21 +25,29 @@ class DescriptorDataBuilder implements BuilderInterface
     private $config;
 
     /**
-     * DescriptorDataBuilder constructor.
+     * @var SubjectReader
+     */
+    private $subjectReader;
+
+    /**
      * @param Config $config
+     * @param SubjectReader $subjectReader
      */
-    public function __construct(Config $config)
+    public function __construct(Config $config, SubjectReader $subjectReader)
     {
         $this->config = $config;
+        $this->subjectReader = $subjectReader;
     }
 
     /**
      * @inheritdoc
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function build(array $buildSubject)
     {
-        $values = $this->config->getDynamicDescriptors();
+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
+        $order = $paymentDO->getOrder();
+
+        $values = $this->config->getDynamicDescriptors($order->getStoreId());
         return !empty($values) ? [self::$descriptorKey => $values] : [];
     }
 }
diff --git a/app/code/Magento/Braintree/Gateway/Request/KountPaymentDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/KountPaymentDataBuilder.php
index 7eebbca1d42..85386677785 100644
--- a/app/code/Magento/Braintree/Gateway/Request/KountPaymentDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/KountPaymentDataBuilder.php
@@ -6,7 +6,7 @@
 namespace Magento\Braintree\Gateway\Request;
 
 use Magento\Braintree\Gateway\Config\Config;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Observer\DataAssignObserver;
 use Magento\Payment\Gateway\Request\BuilderInterface;
 
@@ -48,10 +48,12 @@ public function __construct(Config $config, SubjectReader $subjectReader)
     public function build(array $buildSubject)
     {
         $result = [];
-        if (!$this->config->hasFraudProtection()) {
+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
+        $order = $paymentDO->getOrder();
+
+        if (!$this->config->hasFraudProtection($order->getStoreId())) {
             return $result;
         }
-        $paymentDO = $this->subjectReader->readPayment($buildSubject);
 
         $payment = $paymentDO->getPayment();
         $data = $payment->getAdditionalInformation();
diff --git a/app/code/Magento/Braintree/Gateway/Request/PayPal/DeviceDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/PayPal/DeviceDataBuilder.php
index cea0f8f1291..7d0d9dad0db 100644
--- a/app/code/Magento/Braintree/Gateway/Request/PayPal/DeviceDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/PayPal/DeviceDataBuilder.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Braintree\Gateway\Request\PayPal;
 
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Observer\DataAssignObserver;
 use Magento\Payment\Gateway\Request\BuilderInterface;
 
diff --git a/app/code/Magento/Braintree/Gateway/Request/PayPal/VaultDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/PayPal/VaultDataBuilder.php
index 6f76c3415c3..a035c84b4ca 100644
--- a/app/code/Magento/Braintree/Gateway/Request/PayPal/VaultDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/PayPal/VaultDataBuilder.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Braintree\Gateway\Request\PayPal;
 
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Request\BuilderInterface;
 use Magento\Vault\Model\Ui\VaultConfigProvider;
 
diff --git a/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php
index a3341c3fc18..85a0c644513 100644
--- a/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/PaymentDataBuilder.php
@@ -7,7 +7,7 @@
 
 use Magento\Braintree\Gateway\Config\Config;
 use Magento\Braintree\Observer\DataAssignObserver;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Request\BuilderInterface;
 use Magento\Payment\Helper\Formatter;
 
@@ -87,7 +87,7 @@ public function build(array $buildSubject)
             self::ORDER_ID => $order->getOrderIncrementId()
         ];
 
-        $merchantAccountId = $this->config->getMerchantAccountId();
+        $merchantAccountId = $this->config->getMerchantAccountId($order->getStoreId());
         if (!empty($merchantAccountId)) {
             $result[self::MERCHANT_ACCOUNT_ID] = $merchantAccountId;
         }
diff --git a/app/code/Magento/Braintree/Gateway/Request/RefundDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/RefundDataBuilder.php
index 82de8e84cbf..1c256463111 100644
--- a/app/code/Magento/Braintree/Gateway/Request/RefundDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/RefundDataBuilder.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Braintree\Gateway\Request;
 
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Request\BuilderInterface;
 use Magento\Payment\Helper\Formatter;
 use Magento\Sales\Api\Data\TransactionInterface;
diff --git a/app/code/Magento/Braintree/Gateway/Request/StoreConfigBuilder.php b/app/code/Magento/Braintree/Gateway/Request/StoreConfigBuilder.php
new file mode 100644
index 00000000000..014df33690f
--- /dev/null
+++ b/app/code/Magento/Braintree/Gateway/Request/StoreConfigBuilder.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Gateway\Request;
+
+use Magento\Payment\Gateway\Request\BuilderInterface;
+use Magento\Braintree\Gateway\SubjectReader;
+
+/**
+ * This builder is used for correct store resolving and used only to retrieve correct store ID.
+ * The data from this build won't be send to Braintree Gateway.
+ */
+class StoreConfigBuilder implements BuilderInterface
+{
+    /**
+     * @var SubjectReader
+     */
+    private $subjectReader;
+
+    /**
+     * @param SubjectReader $subjectReader
+     */
+    public function __construct(SubjectReader $subjectReader)
+    {
+        $this->subjectReader = $subjectReader;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function build(array $buildSubject)
+    {
+        $paymentDO = $this->subjectReader->readPayment($buildSubject);
+        $order = $paymentDO->getOrder();
+
+        return [
+            'store_id' => $order->getStoreId()
+        ];
+    }
+}
diff --git a/app/code/Magento/Braintree/Gateway/Request/ThreeDSecureDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/ThreeDSecureDataBuilder.php
index c366a677015..520aa584577 100644
--- a/app/code/Magento/Braintree/Gateway/Request/ThreeDSecureDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/ThreeDSecureDataBuilder.php
@@ -7,7 +7,7 @@
 
 use Magento\Braintree\Gateway\Config\Config;
 use Magento\Payment\Gateway\Data\OrderAdapterInterface;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Request\BuilderInterface;
 use Magento\Payment\Helper\Formatter;
 
@@ -64,12 +64,15 @@ public function build(array $buildSubject)
      */
     private function is3DSecureEnabled(OrderAdapterInterface $order, $amount)
     {
-        if (!$this->config->isVerify3DSecure() || $amount < $this->config->getThresholdAmount()) {
+        $storeId = $order->getStoreId();
+        if (!$this->config->isVerify3DSecure($storeId)
+            || $amount < $this->config->getThresholdAmount($storeId)
+        ) {
             return false;
         }
 
         $billingAddress = $order->getBillingAddress();
-        $specificCounties = $this->config->get3DSecureSpecificCountries();
+        $specificCounties = $this->config->get3DSecureSpecificCountries($storeId);
         if (!empty($specificCounties) && !in_array($billingAddress->getCountryId(), $specificCounties)) {
             return false;
         }
diff --git a/app/code/Magento/Braintree/Gateway/Request/VaultCaptureDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/VaultCaptureDataBuilder.php
index 7182f87e082..4280663178e 100644
--- a/app/code/Magento/Braintree/Gateway/Request/VaultCaptureDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/VaultCaptureDataBuilder.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Braintree\Gateway\Request;
 
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Request\BuilderInterface;
 use Magento\Payment\Helper\Formatter;
 
diff --git a/app/code/Magento/Braintree/Gateway/Request/VoidDataBuilder.php b/app/code/Magento/Braintree/Gateway/Request/VoidDataBuilder.php
index 2328ea10f78..0bbda28cd34 100644
--- a/app/code/Magento/Braintree/Gateway/Request/VoidDataBuilder.php
+++ b/app/code/Magento/Braintree/Gateway/Request/VoidDataBuilder.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Braintree\Gateway\Request;
 
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Request\BuilderInterface;
 use Magento\Sales\Model\Order\Payment;
 
diff --git a/app/code/Magento/Braintree/Gateway/Response/CardDetailsHandler.php b/app/code/Magento/Braintree/Gateway/Response/CardDetailsHandler.php
index 2715da5d3c4..e89e604867b 100644
--- a/app/code/Magento/Braintree/Gateway/Response/CardDetailsHandler.php
+++ b/app/code/Magento/Braintree/Gateway/Response/CardDetailsHandler.php
@@ -6,7 +6,7 @@
 namespace Magento\Braintree\Gateway\Response;
 
 use Magento\Braintree\Gateway\Config\Config;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Helper\ContextHelper;
 use Magento\Payment\Gateway\Response\HandlerInterface;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
diff --git a/app/code/Magento/Braintree/Gateway/Response/PayPal/VaultDetailsHandler.php b/app/code/Magento/Braintree/Gateway/Response/PayPal/VaultDetailsHandler.php
index ae7287c7f23..7d38c2bf7d2 100644
--- a/app/code/Magento/Braintree/Gateway/Response/PayPal/VaultDetailsHandler.php
+++ b/app/code/Magento/Braintree/Gateway/Response/PayPal/VaultDetailsHandler.php
@@ -6,7 +6,7 @@
 namespace Magento\Braintree\Gateway\Response\PayPal;
 
 use Braintree\Transaction;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Framework\Intl\DateTimeFactory;
 use Magento\Payment\Gateway\Response\HandlerInterface;
 use Magento\Payment\Model\InfoInterface;
diff --git a/app/code/Magento/Braintree/Gateway/Response/PayPalDetailsHandler.php b/app/code/Magento/Braintree/Gateway/Response/PayPalDetailsHandler.php
index 83d7e44a6b6..97bb312af4b 100644
--- a/app/code/Magento/Braintree/Gateway/Response/PayPalDetailsHandler.php
+++ b/app/code/Magento/Braintree/Gateway/Response/PayPalDetailsHandler.php
@@ -6,7 +6,7 @@
 namespace Magento\Braintree\Gateway\Response;
 
 use Magento\Payment\Gateway\Response\HandlerInterface;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
 
 /**
diff --git a/app/code/Magento/Braintree/Gateway/Response/PaymentDetailsHandler.php b/app/code/Magento/Braintree/Gateway/Response/PaymentDetailsHandler.php
index 3941640aaee..a95ea76c2e6 100644
--- a/app/code/Magento/Braintree/Gateway/Response/PaymentDetailsHandler.php
+++ b/app/code/Magento/Braintree/Gateway/Response/PaymentDetailsHandler.php
@@ -5,10 +5,8 @@
  */
 namespace Magento\Braintree\Gateway\Response;
 
-use Braintree\Transaction;
 use Magento\Braintree\Observer\DataAssignObserver;
-use Magento\Payment\Gateway\Helper\ContextHelper;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Response\HandlerInterface;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
 
diff --git a/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php b/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php
index 95660e10b39..d4976ff18e0 100644
--- a/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php
+++ b/app/code/Magento/Braintree/Gateway/Response/RiskDataHandler.php
@@ -6,7 +6,7 @@
 namespace Magento\Braintree\Gateway\Response;
 
 use Magento\Payment\Gateway\Helper\ContextHelper;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Response\HandlerInterface;
 
 /**
diff --git a/app/code/Magento/Braintree/Gateway/Response/ThreeDSecureDetailsHandler.php b/app/code/Magento/Braintree/Gateway/Response/ThreeDSecureDetailsHandler.php
index 93f37cb561f..8d61660f03c 100644
--- a/app/code/Magento/Braintree/Gateway/Response/ThreeDSecureDetailsHandler.php
+++ b/app/code/Magento/Braintree/Gateway/Response/ThreeDSecureDetailsHandler.php
@@ -7,7 +7,7 @@
 
 use Braintree\Transaction;
 use Magento\Payment\Gateway\Helper\ContextHelper;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Response\HandlerInterface;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
 
diff --git a/app/code/Magento/Braintree/Gateway/Response/TransactionIdHandler.php b/app/code/Magento/Braintree/Gateway/Response/TransactionIdHandler.php
index 7dd79143736..18888bdcf3d 100644
--- a/app/code/Magento/Braintree/Gateway/Response/TransactionIdHandler.php
+++ b/app/code/Magento/Braintree/Gateway/Response/TransactionIdHandler.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Braintree\Gateway\Response;
 
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Response\HandlerInterface;
 use Magento\Sales\Model\Order\Payment;
 
diff --git a/app/code/Magento/Braintree/Gateway/Response/VaultDetailsHandler.php b/app/code/Magento/Braintree/Gateway/Response/VaultDetailsHandler.php
index 0a561ff5cc2..7c307185b4c 100644
--- a/app/code/Magento/Braintree/Gateway/Response/VaultDetailsHandler.php
+++ b/app/code/Magento/Braintree/Gateway/Response/VaultDetailsHandler.php
@@ -7,7 +7,7 @@
 
 use Braintree\Transaction;
 use Magento\Braintree\Gateway\Config\Config;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Payment\Gateway\Response\HandlerInterface;
@@ -44,7 +44,7 @@ class VaultDetailsHandler implements HandlerInterface
     protected $config;
 
     /**
-     * @var \Magento\Framework\Serialize\Serializer\Json
+     * @var Json
      */
     private $serializer;
 
@@ -69,8 +69,7 @@ public function __construct(
         $this->paymentExtensionFactory = $paymentExtensionFactory;
         $this->config = $config;
         $this->subjectReader = $subjectReader;
-        $this->serializer = $serializer ?: ObjectManager::getInstance()
-            ->get(Json::class);
+        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
     }
 
     /**
diff --git a/app/code/Magento/Braintree/Gateway/Helper/SubjectReader.php b/app/code/Magento/Braintree/Gateway/SubjectReader.php
similarity index 92%
rename from app/code/Magento/Braintree/Gateway/Helper/SubjectReader.php
rename to app/code/Magento/Braintree/Gateway/SubjectReader.php
index e9859765519..d5dc43a4c5e 100644
--- a/app/code/Magento/Braintree/Gateway/Helper/SubjectReader.php
+++ b/app/code/Magento/Braintree/Gateway/SubjectReader.php
@@ -3,13 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Braintree\Gateway\Helper;
+namespace Magento\Braintree\Gateway;
 
 use Braintree\Transaction;
-use Magento\Quote\Model\Quote;
+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Payment\Gateway\Helper;
 use Magento\Vault\Api\Data\PaymentTokenInterface;
-use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 
 /**
  * Class SubjectReader
@@ -119,4 +118,15 @@ public function readPayPal(Transaction $transaction)
 
         return $transaction->paypal;
     }
+
+    /**
+     * Reads store's ID, otherwise returns null.
+     *
+     * @param array $subject
+     * @return int|null
+     */
+    public function readStoreId(array $subject)
+    {
+        return $subject['store_id'] ?? null;
+    }
 }
diff --git a/app/code/Magento/Braintree/Gateway/Validator/GeneralResponseValidator.php b/app/code/Magento/Braintree/Gateway/Validator/GeneralResponseValidator.php
index a70bc2d02e0..8028bace0cf 100644
--- a/app/code/Magento/Braintree/Gateway/Validator/GeneralResponseValidator.php
+++ b/app/code/Magento/Braintree/Gateway/Validator/GeneralResponseValidator.php
@@ -8,7 +8,7 @@
 use Braintree\Result\Error;
 use Braintree\Result\Successful;
 use Magento\Payment\Gateway\Validator\AbstractValidator;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
 
 class GeneralResponseValidator extends AbstractValidator
diff --git a/app/code/Magento/Braintree/Model/Adapter/BraintreeAdapter.php b/app/code/Magento/Braintree/Model/Adapter/BraintreeAdapter.php
index 71f3828ebe9..fd1fe81b5eb 100644
--- a/app/code/Magento/Braintree/Model/Adapter/BraintreeAdapter.php
+++ b/app/code/Magento/Braintree/Model/Adapter/BraintreeAdapter.php
@@ -15,29 +15,40 @@
 
 /**
  * Class BraintreeAdapter
+ * Use \Magento\Braintree\Model\Adapter\BraintreeAdapterFactory to create new instance of adapter.
  * @codeCoverageIgnore
  */
 class BraintreeAdapter
 {
-
     /**
      * @var Config
      */
     private $config;
 
     /**
-     * @param Config $config
+     * @param string $merchantId
+     * @param string $publicKey
+     * @param string $privateKey
+     * @param string $environment
      */
-    public function __construct(Config $config)
+    public function __construct($merchantId, $publicKey, $privateKey, $environment)
     {
-        $this->config = $config;
-        $this->initCredentials();
+        $this->merchantId($merchantId);
+        $this->publicKey($publicKey);
+        $this->privateKey($privateKey);
+
+        if ($environment === Environment::ENVIRONMENT_PRODUCTION) {
+            $this->environment(Environment::ENVIRONMENT_PRODUCTION);
+        } else {
+            $this->environment(Environment::ENVIRONMENT_SANDBOX);
+        }
     }
 
     /**
      * Initializes credentials.
      *
      * @return void
+     * @deprecated is not used anymore
      */
     protected function initCredentials()
     {
diff --git a/app/code/Magento/Braintree/Model/Adapter/BraintreeAdapterFactory.php b/app/code/Magento/Braintree/Model/Adapter/BraintreeAdapterFactory.php
new file mode 100644
index 00000000000..2c3f137eb16
--- /dev/null
+++ b/app/code/Magento/Braintree/Model/Adapter/BraintreeAdapterFactory.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Model\Adapter;
+
+use Magento\Braintree\Gateway\Config\Config;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * This factory is preferable to use for Braintree adapter instance creation.
+ */
+class BraintreeAdapterFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param Config $config
+     */
+    public function __construct(ObjectManagerInterface $objectManager, Config $config)
+    {
+        $this->config = $config;
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Creates instance of Braintree Adapter.
+     *
+     * @param int|null $storeId if null is provided as an argument, then current scope will be resolved
+     * by \Magento\Framework\App\Config\ScopeCodeResolver (useful for most cases) but for adminhtml area the store
+     * should be provided as the argument for correct config settings loading.
+     * @return BraintreeAdapter
+     */
+    public function create($storeId = null)
+    {
+        return $this->objectManager->create(
+            BraintreeAdapter::class,
+            [
+                'merchantId' => $this->config->getMerchantId($storeId),
+                'publicKey' => $this->config->getValue(Config::KEY_PUBLIC_KEY, $storeId),
+                'privateKey' => $this->config->getValue(Config::KEY_PRIVATE_KEY, $storeId),
+                'environment' => $this->config->getEnvironment($storeId),
+            ]
+        );
+    }
+}
diff --git a/app/code/Magento/Braintree/Model/Report/TransactionsCollection.php b/app/code/Magento/Braintree/Model/Report/TransactionsCollection.php
index edac6e35338..a237b64bf58 100644
--- a/app/code/Magento/Braintree/Model/Report/TransactionsCollection.php
+++ b/app/code/Magento/Braintree/Model/Report/TransactionsCollection.php
@@ -5,7 +5,8 @@
  */
 namespace Magento\Braintree\Model\Report;
 
-use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
+use Magento\Braintree\Model\Report\Row\TransactionMap;
 use Magento\Framework\Api\Search\SearchResultInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Data\Collection;
@@ -26,7 +27,7 @@ class TransactionsCollection extends Collection implements SearchResultInterface
      *
      * @var string
      */
-    protected $_itemObjectClass = \Magento\Braintree\Model\Report\Row\TransactionMap::class;
+    protected $_itemObjectClass = TransactionMap::class;
 
     /**
      * @var array
@@ -39,9 +40,9 @@ class TransactionsCollection extends Collection implements SearchResultInterface
     private $filterMapper;
 
     /**
-     * @var BraintreeAdapter
+     * @var BraintreeAdapterFactory
      */
-    private $braintreeAdapter;
+    private $braintreeAdapterFactory;
 
     /**
      * @var \Braintree\ResourceCollection | null
@@ -50,17 +51,17 @@ class TransactionsCollection extends Collection implements SearchResultInterface
 
     /**
      * @param EntityFactoryInterface $entityFactory
-     * @param BraintreeAdapter $braintreeAdapter
+     * @param BraintreeAdapterFactory $braintreeAdapterFactory
      * @param FilterMapper $filterMapper
      */
     public function __construct(
         EntityFactoryInterface $entityFactory,
-        BraintreeAdapter $braintreeAdapter,
+        BraintreeAdapterFactory $braintreeAdapterFactory,
         FilterMapper $filterMapper
     ) {
         parent::__construct($entityFactory);
         $this->filterMapper = $filterMapper;
-        $this->braintreeAdapter = $braintreeAdapter;
+        $this->braintreeAdapterFactory = $braintreeAdapterFactory;
     }
 
     /**
@@ -110,7 +111,8 @@ protected function fetchIdsCollection()
         // Fetch all transaction IDs in order to filter
         if (empty($this->collection)) {
             $filters = $this->getFilters();
-            $this->collection = $this->braintreeAdapter->search($filters);
+            $this->collection = $this->braintreeAdapterFactory->create()
+                ->search($filters);
         }
 
         return $this->collection;
diff --git a/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php b/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php
index c4201954462..fe30e790de0 100644
--- a/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php
+++ b/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php
@@ -5,10 +5,11 @@
  */
 namespace Magento\Braintree\Model\Ui;
 
+use Magento\Braintree\Gateway\Config\Config;
 use Magento\Braintree\Gateway\Request\PaymentDataBuilder;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
 use Magento\Checkout\Model\ConfigProviderInterface;
-use Magento\Braintree\Gateway\Config\Config;
-use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Framework\Session\SessionManagerInterface;
 
 /**
  * Class ConfigProvider
@@ -25,27 +26,35 @@ class ConfigProvider implements ConfigProviderInterface
     private $config;
 
     /**
-     * @var BraintreeAdapter
+     * @var BraintreeAdapterFactory
      */
-    private $adapter;
+    private $adapterFactory;
 
     /**
      * @var string
      */
     private $clientToken = '';
 
+    /**
+     * @var SessionManagerInterface
+     */
+    private $session;
+
     /**
      * Constructor
      *
      * @param Config $config
-     * @param BraintreeAdapter $adapter
+     * @param BraintreeAdapterFactory $adapterFactory
+     * @param SessionManagerInterface $session
      */
     public function __construct(
         Config $config,
-        BraintreeAdapter $adapter
+        BraintreeAdapterFactory $adapterFactory,
+        SessionManagerInterface $session
     ) {
         $this->config = $config;
-        $this->adapter = $adapter;
+        $this->adapterFactory = $adapterFactory;
+        $this->session = $session;
     }
 
     /**
@@ -55,28 +64,29 @@ public function __construct(
      */
     public function getConfig()
     {
+        $storeId = $this->session->getStoreId();
         return [
             'payment' => [
                 self::CODE => [
-                    'isActive' => $this->config->isActive(),
+                    'isActive' => $this->config->isActive($storeId),
                     'clientToken' => $this->getClientToken(),
                     'ccTypesMapper' => $this->config->getCctypesMapper(),
                     'sdkUrl' => $this->config->getSdkUrl(),
-                    'countrySpecificCardTypes' => $this->config->getCountrySpecificCardTypeConfig(),
-                    'availableCardTypes' => $this->config->getAvailableCardTypes(),
-                    'useCvv' => $this->config->isCvvEnabled(),
-                    'environment' => $this->config->getEnvironment(),
-                    'kountMerchantId' => $this->config->getKountMerchantId(),
-                    'hasFraudProtection' => $this->config->hasFraudProtection(),
-                    'merchantId' => $this->config->getMerchantId(),
-                    'ccVaultCode' => self::CC_VAULT_CODE
+                    'countrySpecificCardTypes' => $this->config->getCountrySpecificCardTypeConfig($storeId),
+                    'availableCardTypes' => $this->config->getAvailableCardTypes($storeId),
+                    'useCvv' => $this->config->isCvvEnabled($storeId),
+                    'environment' => $this->config->getEnvironment($storeId),
+                    'kountMerchantId' => $this->config->getKountMerchantId($storeId),
+                    'hasFraudProtection' => $this->config->hasFraudProtection($storeId),
+                    'merchantId' => $this->config->getMerchantId($storeId),
+                    'ccVaultCode' => self::CC_VAULT_CODE,
                 ],
                 Config::CODE_3DSECURE => [
-                    'enabled' => $this->config->isVerify3DSecure(),
-                    'thresholdAmount' => $this->config->getThresholdAmount(),
-                    'specificCountries' => $this->config->get3DSecureSpecificCountries()
+                    'enabled' => $this->config->isVerify3DSecure($storeId),
+                    'thresholdAmount' => $this->config->getThresholdAmount($storeId),
+                    'specificCountries' => $this->config->get3DSecureSpecificCountries($storeId),
                 ],
-            ]
+            ],
         ];
     }
 
@@ -89,12 +99,14 @@ public function getClientToken()
         if (empty($this->clientToken)) {
             $params = [];
 
-            $merchantAccountId = $this->config->getMerchantAccountId();
+            $storeId = $this->session->getStoreId();
+            $merchantAccountId = $this->config->getMerchantAccountId($storeId);
             if (!empty($merchantAccountId)) {
                 $params[PaymentDataBuilder::MERCHANT_ACCOUNT_ID] = $merchantAccountId;
             }
 
-            $this->clientToken = $this->adapter->generate($params);
+            $this->clientToken = $this->adapterFactory->create($storeId)
+                ->generate($params);
         }
 
         return $this->clientToken;
diff --git a/app/code/Magento/Braintree/Test/Unit/Block/FormTest.php b/app/code/Magento/Braintree/Test/Unit/Block/FormTest.php
index 5b28e6d8aed..fa5512ca2db 100644
--- a/app/code/Magento/Braintree/Test/Unit/Block/FormTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Block/FormTest.php
@@ -13,13 +13,11 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Payment\Helper\Data;
 use Magento\Payment\Model\Config;
-use Magento\Store\Api\Data\StoreInterface;
-use Magento\Store\Model\StoreManagerInterface;
 use Magento\Vault\Model\VaultPaymentInterface;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
- * Class FormTest
+ * Tests \Magento\Braintree\Block\Form.
  */
 class FormTest extends \PHPUnit\Framework\TestCase
 {
@@ -45,36 +43,35 @@ class FormTest extends \PHPUnit\Framework\TestCase
     /**
      * @var Quote|MockObject
      */
-    private $sessionQuote;
+    private $sessionQuoteMock;
 
     /**
      * @var Config|MockObject
      */
-    private $gatewayConfig;
+    private $gatewayConfigMock;
 
     /**
      * @var CcType|MockObject
      */
-    private $ccType;
+    private $ccTypeMock;
 
     /**
-     * @var StoreManagerInterface|MockObject
+     * @var Data|MockObject
      */
-    private $storeManager;
+    private $paymentDataHelperMock;
 
     /**
-     * @var Data|MockObject
+     * @var string
      */
-    private $paymentDataHelper;
+    private $storeId = '1';
 
     protected function setUp()
     {
         $this->initCcTypeMock();
         $this->initSessionQuoteMock();
         $this->initGatewayConfigMock();
-        
-        $this->storeManager = $this->getMockForAbstractClass(StoreManagerInterface::class);
-        $this->paymentDataHelper = $this->getMockBuilder(Data::class)
+
+        $this->paymentDataHelperMock = $this->getMockBuilder(Data::class)
             ->disableOriginalConstructor()
             ->setMethods(['getMethodInstance'])
             ->getMock();
@@ -82,13 +79,11 @@ protected function setUp()
         $managerHelper = new ObjectManager($this);
         $this->block = $managerHelper->getObject(Form::class, [
             'paymentConfig' => $managerHelper->getObject(Config::class),
-            'sessionQuote' => $this->sessionQuote,
-            'gatewayConfig' => $this->gatewayConfig,
-            'ccType' => $this->ccType,
-            'storeManager' => $this->storeManager
+            'sessionQuote' => $this->sessionQuoteMock,
+            'gatewayConfig' => $this->gatewayConfigMock,
+            'ccType' => $this->ccTypeMock,
+            'paymentDataHelper' =>$this->paymentDataHelperMock,
         ]);
-
-        $managerHelper->setBackwardCompatibleProperty($this->block, 'paymentDataHelper', $this->paymentDataHelper);
     }
 
     /**
@@ -100,17 +95,18 @@ protected function setUp()
      */
     public function testGetCcAvailableTypes($countryId, array $availableTypes, array $expected)
     {
-        $this->sessionQuote->expects(static::once())
+        $this->sessionQuoteMock->expects(static::once())
             ->method('getCountryId')
             ->willReturn($countryId);
 
-        $this->gatewayConfig->expects(static::once())
+        $this->gatewayConfigMock->expects(static::once())
             ->method('getAvailableCardTypes')
+            ->with($this->storeId)
             ->willReturn(self::$configCardTypes);
 
-        $this->gatewayConfig->expects(static::once())
+        $this->gatewayConfigMock->expects(static::once())
             ->method('getCountryAvailableCardTypes')
-            ->with($countryId)
+            ->with($countryId, $this->storeId)
             ->willReturn($availableTypes);
 
         $result = $this->block->getCcAvailableTypes();
@@ -127,7 +123,7 @@ public function countryCardTypesDataProvider()
             ['US', ['AE', 'VI'], ['American Express', 'Visa']],
             ['UK', ['VI'], ['Visa']],
             ['CA', ['MC'], ['MasterCard']],
-            ['UA', [], ['American Express', 'Visa', 'MasterCard', 'Discover', 'JBC']]
+            ['UA', [], ['American Express', 'Visa', 'MasterCard', 'Discover', 'JBC']],
         ];
     }
 
@@ -136,25 +132,15 @@ public function countryCardTypesDataProvider()
      */
     public function testIsVaultEnabled()
     {
-        $storeId = 1;
-        $store = $this->getMockForAbstractClass(StoreInterface::class);
-        $this->storeManager->expects(static::once())
-            ->method('getStore')
-            ->willReturn($store);
-        
-        $store->expects(static::once())
-            ->method('getId')
-            ->willReturn($storeId);
-
         $vaultPayment = $this->getMockForAbstractClass(VaultPaymentInterface::class);
-        $this->paymentDataHelper->expects(static::once())
+        $this->paymentDataHelperMock->expects(static::once())
             ->method('getMethodInstance')
             ->with(ConfigProvider::CC_VAULT_CODE)
             ->willReturn($vaultPayment);
 
         $vaultPayment->expects(static::once())
             ->method('isActive')
-            ->with($storeId)
+            ->with($this->storeId)
             ->willReturn(true);
 
         static::assertTrue($this->block->isVaultEnabled());
@@ -165,12 +151,12 @@ public function testIsVaultEnabled()
      */
     private function initCcTypeMock()
     {
-        $this->ccType = $this->getMockBuilder(CcType::class)
+        $this->ccTypeMock = $this->getMockBuilder(CcType::class)
             ->disableOriginalConstructor()
             ->setMethods(['getCcTypeLabelMap'])
             ->getMock();
 
-        $this->ccType->expects(static::any())
+        $this->ccTypeMock->expects(static::any())
             ->method('getCcTypeLabelMap')
             ->willReturn(self::$baseCardTypes);
     }
@@ -180,17 +166,20 @@ private function initCcTypeMock()
      */
     private function initSessionQuoteMock()
     {
-        $this->sessionQuote = $this->getMockBuilder(Quote::class)
+        $this->sessionQuoteMock = $this->getMockBuilder(Quote::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getQuote', 'getBillingAddress', 'getCountryId', '__wakeup'])
+            ->setMethods(['getQuote', 'getBillingAddress', 'getCountryId', '__wakeup', 'getStoreId'])
             ->getMock();
 
-        $this->sessionQuote->expects(static::any())
+        $this->sessionQuoteMock->expects(static::any())
             ->method('getQuote')
             ->willReturnSelf();
-        $this->sessionQuote->expects(static::any())
+        $this->sessionQuoteMock->expects(static::any())
             ->method('getBillingAddress')
             ->willReturnSelf();
+        $this->sessionQuoteMock->expects(static::any())
+            ->method('getStoreId')
+            ->willReturn($this->storeId);
     }
 
     /**
@@ -198,7 +187,7 @@ private function initSessionQuoteMock()
      */
     private function initGatewayConfigMock()
     {
-        $this->gatewayConfig = $this->getMockBuilder(GatewayConfig::class)
+        $this->gatewayConfigMock = $this->getMockBuilder(GatewayConfig::class)
             ->disableOriginalConstructor()
             ->setMethods(['getCountryAvailableCardTypes', 'getAvailableCardTypes'])
             ->getMock();
diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Adminhtml/Payment/GetClientTokenTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Adminhtml/Payment/GetClientTokenTest.php
new file mode 100644
index 00000000000..95ea2a07d43
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Controller/Adminhtml/Payment/GetClientTokenTest.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\Unit\Controller\Adminhtml\Payment;
+
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\Session\Quote;
+use Magento\Braintree\Controller\Adminhtml\Payment\GetClientToken;
+use Magento\Braintree\Gateway\Config\Config;
+use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
+use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Tests \Magento\Braintree\Controller\Adminhtml\Payment\GetClientToken
+ */
+class GetClientTokenTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var GetClientToken
+     */
+    private $action;
+
+    /**
+     * @var Config|MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var BraintreeAdapterFactory|MockObject
+     */
+    private $adapterFactoryMock;
+
+    /**
+     * @var Quote|MockObject
+     */
+    private $quoteSessionMock;
+
+    /**
+     * @var ResultFactory|MockObject
+     */
+    private $resultFactoryMock;
+
+    protected function setUp()
+    {
+        $this->resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $context = $this->getMockBuilder(Context::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getResultFactory'])
+            ->getMock();
+        $context->expects(static::any())
+            ->method('getResultFactory')
+            ->willReturn($this->resultFactoryMock);
+        $this->configMock = $this->getMockBuilder(Config::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getMerchantAccountId'])
+            ->getMock();
+        $this->adapterFactoryMock = $this->getMockBuilder(BraintreeAdapterFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->quoteSessionMock = $this->getMockBuilder(Quote::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getStoreId'])
+            ->getMock();
+
+        $managerHelper = new ObjectManager($this);
+        $this->action = $managerHelper->getObject(GetClientToken::class, [
+            'context' => $context,
+            'config' => $this->configMock,
+            'adapterFactory' => $this->adapterFactoryMock,
+            'quoteSession' => $this->quoteSessionMock,
+        ]);
+    }
+
+    public function testExecute()
+    {
+        $storeId = '1';
+        $clientToken = 'client_token';
+        $responseMock = $this->getMockBuilder(ResultInterface::class)
+            ->setMethods(['setHttpResponseCode', 'renderResult', 'setHeader', 'setData'])
+            ->getMock();
+        $responseMock->expects(static::once())
+            ->method('setData')
+            ->with(['clientToken' => $clientToken])
+            ->willReturn($responseMock);
+        $this->resultFactoryMock->expects(static::once())
+            ->method('create')
+            ->willReturn($responseMock);
+        $this->quoteSessionMock->expects(static::once())
+            ->method('getStoreId')
+            ->willReturn($storeId);
+        $this->configMock->expects(static::once())
+            ->method('getMerchantAccountId')
+            ->with($storeId)
+            ->willReturn(null);
+        $adapterMock = $this->getMockBuilder(BraintreeAdapter::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['generate'])
+            ->getMock();
+        $adapterMock->expects(static::once())
+            ->method('generate')
+            ->willReturn($clientToken);
+        $this->adapterFactoryMock->expects(static::once())
+            ->method('create')
+            ->willReturn($adapterMock);
+
+        $this->action->execute();
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Controller/Payment/GetNonceTest.php b/app/code/Magento/Braintree/Test/Unit/Controller/Payment/GetNonceTest.php
index e78e54f011d..4af63a9c871 100644
--- a/app/code/Magento/Braintree/Test/Unit/Controller/Payment/GetNonceTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Controller/Payment/GetNonceTest.php
@@ -15,6 +15,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Webapi\Exception;
 use Magento\Payment\Gateway\Command\ResultInterface as CommandResultInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -30,81 +31,84 @@ class GetNonceTest extends \PHPUnit\Framework\TestCase
     private $action;
 
     /**
-     * @var GetPaymentNonceCommand|\PHPUnit_Framework_MockObject_MockObject
+     * @var GetPaymentNonceCommand|MockObject
      */
-    private $command;
+    private $commandMock;
 
     /**
-     * @var Session|\PHPUnit_Framework_MockObject_MockObject
+     * @var Session|MockObject
      */
-    private $session;
+    private $sessionMock;
 
     /**
-     * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var LoggerInterface|MockObject
      */
-    private $logger;
+    private $loggerMock;
 
     /**
-     * @var ResultFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResultFactory|MockObject
      */
-    private $resultFactory;
+    private $resultFactoryMock;
 
     /**
-     * @var ResultInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResultInterface|MockObject
      */
-    private $result;
+    private $resultMock;
 
     /**
-     * @var Http|\PHPUnit_Framework_MockObject_MockObject
+     * @var Http|MockObject
      */
-    private $request;
+    private $requestMock;
 
     /**
-     * @var CommandResultInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CommandResultInterface|MockObject
      */
-    private $commandResult;
+    private $commandResultMock;
 
     protected function setUp()
     {
         $this->initResultFactoryMock();
 
-        $this->request = $this->getMockBuilder(RequestInterface::class)
+        $this->requestMock = $this->getMockBuilder(RequestInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['getParam'])
             ->getMock();
 
-        $this->command = $this->getMockBuilder(GetPaymentNonceCommand::class)
+        $this->commandMock = $this->getMockBuilder(GetPaymentNonceCommand::class)
             ->disableOriginalConstructor()
             ->setMethods(['execute', '__wakeup'])
             ->getMock();
 
-        $this->commandResult = $this->getMockBuilder(CommandResultInterface::class)
+        $this->commandResultMock = $this->getMockBuilder(CommandResultInterface::class)
             ->setMethods(['get'])
             ->getMock();
 
-        $this->session = $this->getMockBuilder(Session::class)
+        $this->sessionMock = $this->getMockBuilder(Session::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getCustomerId'])
+            ->setMethods(['getCustomerId', 'getStoreId'])
             ->getMock();
+        $this->sessionMock->expects(static::once())
+            ->method('getStoreId')
+            ->willReturn(null);
 
-        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
 
         $context = $this->getMockBuilder(Context::class)
             ->disableOriginalConstructor()
             ->getMock();
         $context->expects(static::any())
             ->method('getRequest')
-            ->willReturn($this->request);
+            ->willReturn($this->requestMock);
         $context->expects(static::any())
             ->method('getResultFactory')
-            ->willReturn($this->resultFactory);
+            ->willReturn($this->resultFactoryMock);
 
         $managerHelper = new ObjectManager($this);
         $this->action = $managerHelper->getObject(GetNonce::class, [
             'context' => $context,
-            'logger' => $this->logger,
-            'session' => $this->session,
-            'command' => $this->command
+            'logger' => $this->loggerMock,
+            'session' => $this->sessionMock,
+            'command' => $this->commandMock,
         ]);
     }
 
@@ -113,28 +117,28 @@ protected function setUp()
      */
     public function testExecuteWithException()
     {
-        $this->request->expects(static::once())
+        $this->requestMock->expects(static::once())
             ->method('getParam')
             ->with('public_hash')
             ->willReturn(null);
 
-        $this->session->expects(static::once())
+        $this->sessionMock->expects(static::once())
             ->method('getCustomerId')
             ->willReturn(null);
 
         $exception = new \Exception('The "publicHash" field does not exists');
-        $this->command->expects(static::once())
+        $this->commandMock->expects(static::once())
             ->method('execute')
             ->willThrowException($exception);
 
-        $this->logger->expects(static::once())
+        $this->loggerMock->expects(static::once())
             ->method('critical')
             ->with($exception);
 
-        $this->result->expects(static::once())
+        $this->resultMock->expects(static::once())
             ->method('setHttpResponseCode')
             ->with(Exception::HTTP_BAD_REQUEST);
-        $this->result->expects(static::once())
+        $this->resultMock->expects(static::once())
             ->method('setData')
             ->with(['message' => 'Sorry, but something went wrong']);
 
@@ -150,32 +154,32 @@ public function testExecute()
         $publicHash = '65b7bae0dcb690d93';
         $nonce = 'f1hc45';
 
-        $this->request->expects(static::once())
+        $this->requestMock->expects(static::once())
             ->method('getParam')
             ->with('public_hash')
             ->willReturn($publicHash);
 
-        $this->session->expects(static::once())
+        $this->sessionMock->expects(static::once())
             ->method('getCustomerId')
             ->willReturn($customerId);
 
-        $this->commandResult->expects(static::once())
+        $this->commandResultMock->expects(static::once())
             ->method('get')
             ->willReturn([
                 'paymentMethodNonce' => $nonce
             ]);
-        $this->command->expects(static::once())
+        $this->commandMock->expects(static::once())
             ->method('execute')
-            ->willReturn($this->commandResult);
+            ->willReturn($this->commandResultMock);
 
-        $this->result->expects(static::once())
+        $this->resultMock->expects(static::once())
             ->method('setData')
             ->with(['paymentMethodNonce' => $nonce]);
 
-        $this->logger->expects(static::never())
+        $this->loggerMock->expects(static::never())
             ->method('critical');
 
-        $this->result->expects(static::never())
+        $this->resultMock->expects(static::never())
             ->method('setHttpResponseCode');
 
         $this->action->execute();
@@ -186,17 +190,17 @@ public function testExecute()
      */
     private function initResultFactoryMock()
     {
-        $this->result = $this->getMockBuilder(ResultInterface::class)
+        $this->resultMock = $this->getMockBuilder(ResultInterface::class)
             ->setMethods(['setHttpResponseCode', 'renderResult', 'setHeader', 'setData'])
             ->getMock();
 
-        $this->resultFactory = $this->getMockBuilder(ResultFactory::class)
+        $this->resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
 
-        $this->resultFactory->expects(static::once())
+        $this->resultFactoryMock->expects(static::once())
             ->method('create')
-            ->willReturn($this->result);
+            ->willReturn($this->resultMock);
     }
 }
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php
index 56ea1f97fa1..845a02930d7 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php
@@ -6,26 +6,25 @@
 namespace Magento\Braintree\Test\Unit\Gateway\Command;
 
 use Braintree\IsNode;
-use Braintree\MultipleValueNode;
-use Braintree\TextNode;
 use Magento\Braintree\Gateway\Command\CaptureStrategyCommand;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
+use Magento\Braintree\Model\Adapter\BraintreeSearchAdapter;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\Search\SearchCriteria;
 use Magento\Framework\Api\SearchCriteriaBuilder;
-use Magento\Payment\Gateway\Command;
 use Magento\Payment\Gateway\Command\CommandPoolInterface;
 use Magento\Payment\Gateway\Command\GatewayCommand;
+use Magento\Payment\Gateway\Data\OrderAdapterInterface;
 use Magento\Payment\Gateway\Data\PaymentDataObject;
 use Magento\Sales\Api\TransactionRepositoryInterface;
 use Magento\Sales\Model\Order\Payment;
-use Magento\Sales\Model\Order\Payment\Transaction;
 use Magento\Sales\Model\ResourceModel\Order\Payment\Transaction\CollectionFactory;
-use Magento\Braintree\Model\Adapter\BraintreeAdapter;
-use Magento\Braintree\Model\Adapter\BraintreeSearchAdapter;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
- * Class CaptureStrategyCommandTest
+ * Tests \Magento\Braintree\Gateway\Command\CaptureStrategyCommand.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -37,44 +36,44 @@ class CaptureStrategyCommandTest extends \PHPUnit\Framework\TestCase
     private $strategyCommand;
 
     /**
-     * @var CommandPoolInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var CommandPoolInterface|MockObject
      */
-    private $commandPool;
+    private $commandPoolMock;
 
     /**
-     * @var TransactionRepositoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var TransactionRepositoryInterface|MockObject
      */
-    private $transactionRepository;
+    private $transactionRepositoryMock;
 
     /**
-     * @var FilterBuilder|\PHPUnit_Framework_MockObject_MockObject
+     * @var FilterBuilder|MockObject
      */
-    private $filterBuilder;
+    private $filterBuilderMock;
 
     /**
-     * @var SearchCriteriaBuilder|\PHPUnit_Framework_MockObject_MockObject
+     * @var SearchCriteriaBuilder|MockObject
      */
-    private $searchCriteriaBuilder;
+    private $searchCriteriaBuilderMock;
 
     /**
-     * @var Payment|\PHPUnit_Framework_MockObject_MockObject
+     * @var Payment|MockObject
      */
-    private $payment;
+    private $paymentMock;
 
     /**
-     * @var GatewayCommand|\PHPUnit_Framework_MockObject_MockObject
+     * @var GatewayCommand|MockObject
      */
-    private $command;
+    private $commandMock;
 
     /**
-     * @var SubjectReader|\PHPUnit_Framework_MockObject_MockObject
+     * @var SubjectReader|MockObject
      */
     private $subjectReaderMock;
 
     /**
-     * @var BraintreeAdapter|\PHPUnit_Framework_MockObject_MockObject
+     * @var BraintreeAdapter|MockObject
      */
-    private $braintreeAdapter;
+    private $braintreeAdapterMock;
 
     /**
      * @var BraintreeSearchAdapter
@@ -83,7 +82,7 @@ class CaptureStrategyCommandTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->commandPool = $this->getMockBuilder(CommandPoolInterface::class)
+        $this->commandPoolMock = $this->getMockBuilder(CommandPoolInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['get', '__wakeup'])
             ->getMock();
@@ -97,18 +96,26 @@ protected function setUp()
         $this->initFilterBuilderMock();
         $this->initSearchCriteriaBuilderMock();
 
-        $this->braintreeAdapter = $this->getMockBuilder(BraintreeAdapter::class)
+        $this->braintreeAdapterMock = $this->getMockBuilder(BraintreeAdapter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var BraintreeAdapterFactory|MockObject $adapterFactoryMock */
+        $adapterFactoryMock = $this->getMockBuilder(BraintreeAdapterFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $adapterFactoryMock->expects(self::any())
+            ->method('create')
+            ->willReturn($this->braintreeAdapterMock);
+
         $this->braintreeSearchAdapter = new BraintreeSearchAdapter();
 
         $this->strategyCommand = new CaptureStrategyCommand(
-            $this->commandPool,
-            $this->transactionRepository,
-            $this->filterBuilder,
-            $this->searchCriteriaBuilder,
+            $this->commandPoolMock,
+            $this->transactionRepositoryMock,
+            $this->filterBuilderMock,
+            $this->searchCriteriaBuilderMock,
             $this->subjectReaderMock,
-            $this->braintreeAdapter,
+            $adapterFactoryMock,
             $this->braintreeSearchAdapter
         );
     }
@@ -126,24 +133,24 @@ public function testSaleExecute()
             ->with($subject)
             ->willReturn($paymentData);
 
-        $this->payment->expects(static::once())
+        $this->paymentMock->expects(static::once())
             ->method('getAuthorizationTransaction')
             ->willReturn(false);
 
-        $this->payment->expects(static::once())
+        $this->paymentMock->expects(static::once())
             ->method('getId')
             ->willReturn(1);
 
         $this->buildSearchCriteria();
 
-        $this->transactionRepository->expects(static::once())
+        $this->transactionRepositoryMock->expects(static::once())
             ->method('getTotalCount')
             ->willReturn(0);
 
-        $this->commandPool->expects(static::once())
+        $this->commandPoolMock->expects(static::once())
             ->method('get')
             ->with(CaptureStrategyCommand::SALE)
-            ->willReturn($this->command);
+            ->willReturn($this->commandMock);
 
         $this->strategyCommand->execute($subject);
     }
@@ -162,20 +169,20 @@ public function testCaptureExecute()
             ->with($subject)
             ->willReturn($paymentData);
 
-        $this->payment->expects(static::once())
+        $this->paymentMock->expects(static::once())
             ->method('getAuthorizationTransaction')
             ->willReturn(true);
-        $this->payment->expects(static::once())
+        $this->paymentMock->expects(static::once())
             ->method('getLastTransId')
             ->willReturn($lastTransId);
 
-        $this->payment->expects(static::once())
+        $this->paymentMock->expects(static::once())
             ->method('getId')
             ->willReturn(1);
 
         $this->buildSearchCriteria();
 
-        $this->transactionRepository->expects(static::once())
+        $this->transactionRepositoryMock->expects(static::once())
             ->method('getTotalCount')
             ->willReturn(0);
 
@@ -185,17 +192,17 @@ public function testCaptureExecute()
             ->method('maximumCount')
             ->willReturn(0);
 
-        $this->commandPool->expects(static::once())
+        $this->commandPoolMock->expects(static::once())
             ->method('get')
             ->with(CaptureStrategyCommand::CAPTURE)
-            ->willReturn($this->command);
+            ->willReturn($this->commandMock);
 
         $this->strategyCommand->execute($subject);
     }
 
     /**
      * @param string $lastTransactionId
-     * @return \Braintree\ResourceCollection|\PHPUnit_Framework_MockObject_MockObject
+     * @return \Braintree\ResourceCollection|MockObject
      */
     private function getNotExpiredExpectedCollection($lastTransactionId)
     {
@@ -208,7 +215,7 @@ private function getNotExpiredExpectedCollection($lastTransactionId)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->braintreeAdapter->expects(static::once())
+        $this->braintreeAdapterMock->expects(static::once())
             ->method('search')
             ->with(
                 static::callback(
@@ -247,20 +254,20 @@ public function testExpiredAuthorizationPerformVaultCaptureExecute()
             ->with($subject)
             ->willReturn($paymentData);
 
-        $this->payment->expects(static::once())
+        $this->paymentMock->expects(static::once())
             ->method('getAuthorizationTransaction')
             ->willReturn(true);
-        $this->payment->expects(static::once())
+        $this->paymentMock->expects(static::once())
             ->method('getLastTransId')
             ->willReturn($lastTransId);
 
-        $this->payment->expects(static::once())
+        $this->paymentMock->expects(static::once())
             ->method('getId')
             ->willReturn(1);
 
         $this->buildSearchCriteria();
 
-        $this->transactionRepository->expects(static::once())
+        $this->transactionRepositoryMock->expects(static::once())
             ->method('getTotalCount')
             ->willReturn(0);
 
@@ -270,10 +277,10 @@ public function testExpiredAuthorizationPerformVaultCaptureExecute()
             ->method('maximumCount')
             ->willReturn(1);
 
-        $this->commandPool->expects(static::once())
+        $this->commandPoolMock->expects(static::once())
             ->method('get')
             ->with(CaptureStrategyCommand::VAULT_CAPTURE)
-            ->willReturn($this->command);
+            ->willReturn($this->commandMock);
 
         $this->strategyCommand->execute($subject);
     }
@@ -291,97 +298,104 @@ public function testVaultCaptureExecute()
             ->with($subject)
             ->willReturn($paymentData);
 
-        $this->payment->expects(static::once())
+        $this->paymentMock->expects(static::once())
             ->method('getAuthorizationTransaction')
             ->willReturn(true);
 
-        $this->payment->expects(static::once())
+        $this->paymentMock->expects(static::once())
             ->method('getId')
             ->willReturn(1);
 
         $this->buildSearchCriteria();
 
-        $this->transactionRepository->expects(static::once())
+        $this->transactionRepositoryMock->expects(static::once())
             ->method('getTotalCount')
             ->willReturn(1);
 
-        $this->commandPool->expects(static::once())
+        $this->commandPoolMock->expects(static::once())
             ->method('get')
             ->with(CaptureStrategyCommand::VAULT_CAPTURE)
-            ->willReturn($this->command);
+            ->willReturn($this->commandMock);
 
         $this->strategyCommand->execute($subject);
     }
 
     /**
-     * Create mock for payment data object and order payment
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * Creates mock for payment data object and order payment
+     * @return MockObject
      */
     private function getPaymentDataObjectMock()
     {
-        $this->payment = $this->getMockBuilder(Payment::class)
+        $this->paymentMock = $this->getMockBuilder(Payment::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $mock = $this->getMockBuilder(PaymentDataObject::class)
-            ->setMethods(['getPayment'])
+            ->setMethods(['getPayment', 'getOrder'])
             ->disableOriginalConstructor()
             ->getMock();
 
         $mock->expects(static::once())
             ->method('getPayment')
-            ->willReturn($this->payment);
+            ->willReturn($this->paymentMock);
+
+        $orderMock = $this->getMockBuilder(OrderAdapterInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $mock->method('getOrder')
+            ->willReturn($orderMock);
 
         return $mock;
     }
 
     /**
-     * Create mock for gateway command object
+     * Creates mock for gateway command object
      */
     private function initCommandMock()
     {
-        $this->command = $this->getMockBuilder(GatewayCommand::class)
+        $this->commandMock = $this->getMockBuilder(GatewayCommand::class)
             ->disableOriginalConstructor()
             ->setMethods(['execute'])
             ->getMock();
 
-        $this->command->expects(static::once())
+        $this->commandMock->expects(static::once())
             ->method('execute')
             ->willReturn([]);
     }
 
     /**
-     * Create mock for filter object
+     * Creates mock for filter object
      */
     private function initFilterBuilderMock()
     {
-        $this->filterBuilder = $this->getMockBuilder(FilterBuilder::class)
+        $this->filterBuilderMock = $this->getMockBuilder(FilterBuilder::class)
             ->disableOriginalConstructor()
             ->setMethods(['setField', 'setValue', 'create', '__wakeup'])
             ->getMock();
     }
 
     /**
-     * Build search criteria
+     * Builds search criteria
      */
     private function buildSearchCriteria()
     {
-        $this->filterBuilder->expects(static::exactly(2))
+        $this->filterBuilderMock->expects(static::exactly(2))
             ->method('setField')
             ->willReturnSelf();
-        $this->filterBuilder->expects(static::exactly(2))
+        $this->filterBuilderMock->expects(static::exactly(2))
             ->method('setValue')
             ->willReturnSelf();
 
         $searchCriteria = new SearchCriteria();
-        $this->searchCriteriaBuilder->expects(static::exactly(2))
+        $this->searchCriteriaBuilderMock->expects(static::exactly(2))
             ->method('addFilters')
             ->willReturnSelf();
-        $this->searchCriteriaBuilder->expects(static::once())
+        $this->searchCriteriaBuilderMock->expects(static::once())
             ->method('create')
             ->willReturn($searchCriteria);
 
-        $this->transactionRepository->expects(static::once())
+        $this->transactionRepositoryMock->expects(static::once())
             ->method('getList')
             ->with($searchCriteria)
             ->willReturnSelf();
@@ -392,7 +406,7 @@ private function buildSearchCriteria()
      */
     private function initSearchCriteriaBuilderMock()
     {
-        $this->searchCriteriaBuilder = $this->getMockBuilder(SearchCriteriaBuilder::class)
+        $this->searchCriteriaBuilderMock = $this->getMockBuilder(SearchCriteriaBuilder::class)
             ->disableOriginalConstructor()
             ->setMethods(['addFilters', 'create', '__wakeup'])
             ->getMock();
@@ -403,7 +417,7 @@ private function initSearchCriteriaBuilderMock()
      */
     private function initTransactionRepositoryMock()
     {
-        $this->transactionRepository = $this->getMockBuilder(TransactionRepositoryInterface::class)
+        $this->transactionRepositoryMock = $this->getMockBuilder(TransactionRepositoryInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['getList', 'getTotalCount', 'delete', 'get', 'save', 'create', '__wakeup'])
             ->getMock();
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Command/GetPaymentNonceCommandTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Command/GetPaymentNonceCommandTest.php
index 6debedf0a0e..bf15d038297 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Command/GetPaymentNonceCommandTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Command/GetPaymentNonceCommandTest.php
@@ -3,19 +3,19 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Braintree\Test\Unit\Gateway\Command;
 
 use Magento\Braintree\Gateway\Command\GetPaymentNonceCommand;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Validator\PaymentNonceResponseValidator;
 use Magento\Braintree\Model\Adapter\BraintreeAdapter;
-use Magento\Payment\Gateway\Command;
-use Magento\Payment\Gateway\Command\Result\ArrayResultFactory;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
 use Magento\Payment\Gateway\Command\Result\ArrayResult;
+use Magento\Payment\Gateway\Command\Result\ArrayResultFactory;
 use Magento\Payment\Gateway\Validator\ResultInterface;
 use Magento\Vault\Model\PaymentToken;
 use Magento\Vault\Model\PaymentTokenManagement;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Class GetPaymentNonceCommandTest
@@ -30,82 +30,89 @@ class GetPaymentNonceCommandTest extends \PHPUnit\Framework\TestCase
     private $command;
 
     /**
-     * @var BraintreeAdapter|\PHPUnit_Framework_MockObject_MockObject
+     * @var BraintreeAdapter|MockObject
      */
-    private $adapter;
+    private $adapterMock;
 
     /**
-     * @var PaymentTokenManagement|\PHPUnit_Framework_MockObject_MockObject
+     * @var PaymentTokenManagement|MockObject
      */
-    private $tokenManagement;
+    private $tokenManagementMock;
 
     /**
-     * @var PaymentToken|\PHPUnit_Framework_MockObject_MockObject
+     * @var PaymentToken|MockObject
      */
-    private $paymentToken;
+    private $paymentTokenMock;
 
     /**
-     * @var ArrayResultFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var ArrayResultFactory|MockObject
      */
-    private $resultFactory;
+    private $resultFactoryMock;
 
     /**
-     * @var SubjectReader|\PHPUnit_Framework_MockObject_MockObject
+     * @var SubjectReader|MockObject
      */
-    private $subjectReader;
+    private $subjectReaderMock;
 
     /**
-     * @var PaymentNonceResponseValidator|\PHPUnit_Framework_MockObject_MockObject
+     * @var PaymentNonceResponseValidator|MockObject
      */
-    private $responseValidator;
+    private $responseValidatorMock;
 
     /**
-     * @var ResultInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResultInterface|MockObject
      */
-    private $validationResult;
+    private $validationResultMock;
 
     protected function setUp()
     {
-        $this->paymentToken = $this->getMockBuilder(PaymentToken::class)
+        $this->paymentTokenMock = $this->getMockBuilder(PaymentToken::class)
             ->disableOriginalConstructor()
             ->setMethods(['getGatewayToken'])
             ->getMock();
 
-        $this->tokenManagement = $this->getMockBuilder(PaymentTokenManagement::class)
+        $this->tokenManagementMock = $this->getMockBuilder(PaymentTokenManagement::class)
             ->disableOriginalConstructor()
             ->setMethods(['getByPublicHash'])
             ->getMock();
 
-        $this->adapter = $this->getMockBuilder(BraintreeAdapter::class)
+        $this->adapterMock = $this->getMockBuilder(BraintreeAdapter::class)
             ->disableOriginalConstructor()
             ->setMethods(['createNonce'])
             ->getMock();
+        /** @var BraintreeAdapterFactory|MockObject $adapterFactoryMock */
+        $adapterFactoryMock = $this->getMockBuilder(BraintreeAdapterFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $adapterFactoryMock->expects(self::any())
+            ->method('create')
+            ->willReturn($this->adapterMock);
 
-        $this->resultFactory = $this->getMockBuilder(ArrayResultFactory::class)
+        $this->resultFactoryMock = $this->getMockBuilder(ArrayResultFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
 
-        $this->subjectReader = $this->getMockBuilder(SubjectReader::class)
+        $this->subjectReaderMock = $this->getMockBuilder(SubjectReader::class)
             ->disableOriginalConstructor()
             ->setMethods(['readPublicHash', 'readCustomerId'])
             ->getMock();
 
-        $this->validationResult = $this->getMockBuilder(ResultInterface::class)
+        $this->validationResultMock = $this->getMockBuilder(ResultInterface::class)
             ->setMethods(['isValid', 'getFailsDescription'])
             ->getMock();
 
-        $this->responseValidator = $this->getMockBuilder(PaymentNonceResponseValidator::class)
+        $this->responseValidatorMock = $this->getMockBuilder(PaymentNonceResponseValidator::class)
             ->disableOriginalConstructor()
             ->setMethods(['validate', 'isValid', 'getFailsDescription'])
             ->getMock();
 
         $this->command = new GetPaymentNonceCommand(
-            $this->tokenManagement,
-            $this->adapter,
-            $this->resultFactory,
-            $this->subjectReader,
-            $this->responseValidator
+            $this->tokenManagementMock,
+            $adapterFactoryMock,
+            $this->resultFactoryMock,
+            $this->subjectReaderMock,
+            $this->responseValidatorMock
         );
     }
 
@@ -118,11 +125,11 @@ public function testExecuteWithExceptionForPublicHash()
     {
         $exception = new \InvalidArgumentException('The "publicHash" field does not exists');
 
-        $this->subjectReader->expects(static::once())
+        $this->subjectReaderMock->expects(static::once())
             ->method('readPublicHash')
             ->willThrowException($exception);
 
-        $this->subjectReader->expects(static::never())
+        $this->subjectReaderMock->expects(self::never())
             ->method('readCustomerId');
 
         $this->command->execute([]);
@@ -137,16 +144,16 @@ public function testExecuteWithExceptionForCustomerId()
     {
         $publicHash = '3wv2m24d2er3';
 
-        $this->subjectReader->expects(static::once())
+        $this->subjectReaderMock->expects(static::once())
             ->method('readPublicHash')
             ->willReturn($publicHash);
 
         $exception = new \InvalidArgumentException('The "customerId" field does not exists');
-        $this->subjectReader->expects(static::once())
+        $this->subjectReaderMock->expects(static::once())
             ->method('readCustomerId')
             ->willThrowException($exception);
 
-        $this->tokenManagement->expects(static::never())
+        $this->tokenManagementMock->expects(static::never())
             ->method('getByPublicHash');
 
         $this->command->execute(['publicHash' => $publicHash]);
@@ -155,27 +162,27 @@ public function testExecuteWithExceptionForCustomerId()
     /**
      * @covers \Magento\Braintree\Gateway\Command\GetPaymentNonceCommand::execute
      * @expectedException \Exception
-     * @expectedExceptionMessage No payment tokens are available.
+     * @expectedExceptionMessage No available payment tokens
      */
     public function testExecuteWithExceptionForTokenManagement()
     {
         $publicHash = '3wv2m24d2er3';
         $customerId = 1;
 
-        $this->subjectReader->expects(static::once())
+        $this->subjectReaderMock->expects(static::once())
             ->method('readPublicHash')
             ->willReturn($publicHash);
 
-        $this->subjectReader->expects(static::once())
+        $this->subjectReaderMock->expects(static::once())
             ->method('readCustomerId')
             ->willReturn($customerId);
 
-        $exception = new \Exception('No payment tokens are available.');
-        $this->tokenManagement->expects(static::once())
+        $exception = new \Exception('No available payment tokens');
+        $this->tokenManagementMock->expects(static::once())
             ->method('getByPublicHash')
             ->willThrowException($exception);
 
-        $this->paymentToken->expects(static::never())
+        $this->paymentTokenMock->expects(self::never())
             ->method('getGatewayToken');
 
         $this->command->execute(['publicHash' => $publicHash, 'customerId' => $customerId]);
@@ -192,44 +199,44 @@ public function testExecuteWithFailedValidation()
         $customerId = 1;
         $token = 'jd2vnq';
 
-        $this->subjectReader->expects(static::once())
+        $this->subjectReaderMock->expects(static::once())
             ->method('readPublicHash')
             ->willReturn($publicHash);
 
-        $this->subjectReader->expects(static::once())
+        $this->subjectReaderMock->expects(static::once())
             ->method('readCustomerId')
             ->willReturn($customerId);
 
-        $this->tokenManagement->expects(static::once())
+        $this->tokenManagementMock->expects(static::once())
             ->method('getByPublicHash')
             ->with($publicHash, $customerId)
-            ->willReturn($this->paymentToken);
+            ->willReturn($this->paymentTokenMock);
 
-        $this->paymentToken->expects(static::once())
+        $this->paymentTokenMock->expects(static::once())
             ->method('getGatewayToken')
             ->willReturn($token);
 
         $obj = new \stdClass();
         $obj->success = false;
-        $this->adapter->expects(static::once())
+        $this->adapterMock->expects(static::once())
             ->method('createNonce')
             ->with($token)
             ->willReturn($obj);
 
-        $this->responseValidator->expects(static::once())
+        $this->responseValidatorMock->expects(static::once())
             ->method('validate')
             ->with(['response' => ['object' => $obj]])
-            ->willReturn($this->validationResult);
+            ->willReturn($this->validationResultMock);
 
-        $this->validationResult->expects(static::once())
+        $this->validationResultMock->expects(static::once())
             ->method('isValid')
             ->willReturn(false);
 
-        $this->validationResult->expects(static::once())
+        $this->validationResultMock->expects(static::once())
             ->method('getFailsDescription')
             ->willReturn(['Payment method nonce can\'t be retrieved.']);
 
-        $this->resultFactory->expects(static::never())
+        $this->resultFactoryMock->expects(static::never())
             ->method('create');
 
         $this->command->execute(['publicHash' => $publicHash, 'customerId' => $customerId]);
@@ -245,20 +252,20 @@ public function testExecute()
         $token = 'jd2vnq';
         $nonce = 's1dj23';
 
-        $this->subjectReader->expects(static::once())
+        $this->subjectReaderMock->expects(static::once())
             ->method('readPublicHash')
             ->willReturn($publicHash);
 
-        $this->subjectReader->expects(static::once())
+        $this->subjectReaderMock->expects(static::once())
             ->method('readCustomerId')
             ->willReturn($customerId);
 
-        $this->tokenManagement->expects(static::once())
+        $this->tokenManagementMock->expects(static::once())
             ->method('getByPublicHash')
             ->with($publicHash, $customerId)
-            ->willReturn($this->paymentToken);
+            ->willReturn($this->paymentTokenMock);
 
-        $this->paymentToken->expects(static::once())
+        $this->paymentTokenMock->expects(static::once())
             ->method('getGatewayToken')
             ->willReturn($token);
 
@@ -266,21 +273,21 @@ public function testExecute()
         $obj->success = true;
         $obj->paymentMethodNonce = new \stdClass();
         $obj->paymentMethodNonce->nonce = $nonce;
-        $this->adapter->expects(static::once())
+        $this->adapterMock->expects(static::once())
             ->method('createNonce')
             ->with($token)
             ->willReturn($obj);
 
-        $this->responseValidator->expects(static::once())
+        $this->responseValidatorMock->expects(static::once())
             ->method('validate')
             ->with(['response' => ['object' => $obj]])
-            ->willReturn($this->validationResult);
+            ->willReturn($this->validationResultMock);
 
-        $this->validationResult->expects(static::once())
+        $this->validationResultMock->expects(static::once())
             ->method('isValid')
             ->willReturn(true);
 
-        $this->validationResult->expects(static::never())
+        $this->validationResultMock->expects(self::never())
             ->method('getFailsDescription');
 
         $expected = $this->getMockBuilder(ArrayResult::class)
@@ -290,12 +297,12 @@ public function testExecute()
         $expected->expects(static::once())
             ->method('get')
             ->willReturn(['paymentMethodNonce' => $nonce]);
-        $this->resultFactory->expects(static::once())
+        $this->resultFactoryMock->expects(static::once())
             ->method('create')
             ->willReturn($expected);
 
         $actual = $this->command->execute(['publicHash' => $publicHash, 'customerId' => $customerId]);
-        static::assertEquals($expected, $actual);
-        static::assertEquals($nonce, $actual->get()['paymentMethodNonce']);
+        self::assertEquals($expected, $actual);
+        self::assertEquals($nonce, $actual->get()['paymentMethodNonce']);
     }
 }
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Config/CanVoidHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Config/CanVoidHandlerTest.php
index 4478a6d6d46..031e5369045 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Config/CanVoidHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Config/CanVoidHandlerTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Braintree\Test\Unit\Gateway\Config;
 
 use Magento\Braintree\Gateway\Config\CanVoidHandler;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Payment\Model\InfoInterface;
 use Magento\Sales\Model\Order\Payment;
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionRefundTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionRefundTest.php
new file mode 100644
index 00000000000..c871dc69a53
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionRefundTest.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\Unit\Gateway\Http\Client;
+
+use Magento\Braintree\Gateway\Http\Client\TransactionRefund;
+use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
+use Magento\Payment\Gateway\Http\TransferInterface;
+use Magento\Payment\Model\Method\Logger;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Psr\Log\LoggerInterface;
+use Magento\Braintree\Gateway\Request\PaymentDataBuilder;
+
+/**
+ * Tests \Magento\Braintree\Gateway\Http\Client\TransactionRefund.
+ */
+class TransactionRefundTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var TransactionRefund
+     */
+    private $client;
+
+    /**
+     * @var Logger|MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @var BraintreeAdapter|MockObject
+     */
+    private $adapterMock;
+
+    /**
+     * @var string
+     */
+    private $transactionId = 'px4kpev5';
+
+    /**
+     * @var string
+     */
+    private $paymentAmount = '100.00';
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        /** @var LoggerInterface|MockObject $criticalLoggerMock */
+        $criticalLoggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
+        $this->loggerMock = $this->getMockBuilder(Logger::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->adapterMock = $this->getMockBuilder(BraintreeAdapter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var BraintreeAdapterFactory|MockObject $adapterFactoryMock */
+        $adapterFactoryMock = $this->getMockBuilder(BraintreeAdapterFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $adapterFactoryMock->expects(self::once())
+            ->method('create')
+            ->willReturn($this->adapterMock);
+
+        $this->client = new TransactionRefund($criticalLoggerMock, $this->loggerMock, $adapterFactoryMock);
+    }
+
+    /**
+     * @return void
+     *
+     * @expectedException \Magento\Payment\Gateway\Http\ClientException
+     * @expectedExceptionMessage Test messages
+     */
+    public function testPlaceRequestException()
+    {
+        $this->loggerMock->expects($this->once())
+            ->method('debug')
+            ->with(
+                [
+                    'request' => $this->getTransferData(),
+                    'client' => TransactionRefund::class,
+                    'response' => [],
+                ]
+            );
+
+        $this->adapterMock->expects($this->once())
+            ->method('refund')
+            ->with($this->transactionId, $this->paymentAmount)
+            ->willThrowException(new \Exception('Test messages'));
+
+        /** @var TransferInterface|MockObject $transferObjectMock */
+        $transferObjectMock = $this->getTransferObjectMock();
+
+        $this->client->placeRequest($transferObjectMock);
+    }
+
+    /**
+     * @return void
+     */
+    public function testPlaceRequestSuccess()
+    {
+        $response = new \stdClass;
+        $response->success = true;
+        $this->adapterMock->expects($this->once())
+            ->method('refund')
+            ->with($this->transactionId, $this->paymentAmount)
+            ->willReturn($response);
+
+        $this->loggerMock->expects($this->once())
+            ->method('debug')
+            ->with(
+                [
+                    'request' => $this->getTransferData(),
+                    'client' => TransactionRefund::class,
+                    'response' => ['success' => 1],
+                ]
+            );
+
+        $actualResult = $this->client->placeRequest($this->getTransferObjectMock());
+
+        $this->assertTrue(is_object($actualResult['object']));
+        $this->assertEquals(['object' => $response], $actualResult);
+    }
+
+    /**
+     * Creates mock object for TransferInterface.
+     *
+     * @return TransferInterface|MockObject
+     */
+    private function getTransferObjectMock()
+    {
+        $transferObjectMock = $this->createMock(TransferInterface::class);
+        $transferObjectMock->expects($this->once())
+            ->method('getBody')
+            ->willReturn($this->getTransferData());
+
+        return $transferObjectMock;
+    }
+
+    /**
+     * Creates stub request data.
+     *
+     * @return array
+     */
+    private function getTransferData()
+    {
+        return [
+            'transaction_id' => $this->transactionId,
+            PaymentDataBuilder::AMOUNT => $this->paymentAmount,
+        ];
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionSaleTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionSaleTest.php
index 0837ecaea7a..1317deeddb7 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionSaleTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionSaleTest.php
@@ -7,12 +7,14 @@
 
 use Magento\Braintree\Gateway\Http\Client\TransactionSale;
 use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
 use Magento\Payment\Gateway\Http\TransferInterface;
 use Magento\Payment\Model\Method\Logger;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Psr\Log\LoggerInterface;
 
 /**
- * Class TransactionSaleTest
+ * Tests \Magento\Braintree\Gateway\Http\Client\TransactionSale.
  */
 class TransactionSaleTest extends \PHPUnit\Framework\TestCase
 {
@@ -22,35 +24,41 @@ class TransactionSaleTest extends \PHPUnit\Framework\TestCase
     private $model;
 
     /**
-     * @var Logger|\PHPUnit_Framework_MockObject_MockObject
+     * @var Logger|MockObject
      */
     private $loggerMock;
 
     /**
-     * @var BraintreeAdapter|\PHPUnit_Framework_MockObject_MockObject
+     * @var BraintreeAdapter|MockObject
      */
-    private $adapter;
+    private $adapterMock;
 
     /**
-     * Set up
-     *
-     * @return void
+     * @inheritdoc
      */
     protected function setUp()
     {
+        /** @var LoggerInterface|MockObject $criticalLoggerMock */
         $criticalLoggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
         $this->loggerMock = $this->getMockBuilder(Logger::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->adapter = $this->getMockBuilder(BraintreeAdapter::class)
+        $this->adapterMock = $this->getMockBuilder(BraintreeAdapter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var BraintreeAdapterFactory|MockObject $adapterFactoryMock */
+        $adapterFactoryMock = $this->getMockBuilder(BraintreeAdapterFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $adapterFactoryMock->expects(self::once())
+            ->method('create')
+            ->willReturn($this->adapterMock);
 
-        $this->model = new TransactionSale($criticalLoggerMock, $this->loggerMock, $this->adapter);
+        $this->model = new TransactionSale($criticalLoggerMock, $this->loggerMock, $adapterFactoryMock);
     }
 
     /**
-     * Run test placeRequest method (exception)
+     * Runs test placeRequest method (exception)
      *
      * @return void
      *
@@ -69,11 +77,11 @@ public function testPlaceRequestException()
                 ]
             );
 
-        $this->adapter->expects($this->once())
+        $this->adapterMock->expects($this->once())
             ->method('sale')
             ->willThrowException(new \Exception('Test messages'));
 
-        /** @var TransferInterface|\PHPUnit_Framework_MockObject_MockObject $transferObjectMock */
+        /** @var TransferInterface|MockObject $transferObjectMock */
         $transferObjectMock = $this->getTransferObjectMock();
 
         $this->model->placeRequest($transferObjectMock);
@@ -87,7 +95,7 @@ public function testPlaceRequestException()
     public function testPlaceRequestSuccess()
     {
         $response = $this->getResponseObject();
-        $this->adapter->expects($this->once())
+        $this->adapterMock->expects($this->once())
             ->method('sale')
             ->with($this->getTransferData())
             ->willReturn($response);
@@ -109,7 +117,9 @@ public function testPlaceRequestSuccess()
     }
 
     /**
-     * @return TransferInterface|\PHPUnit_Framework_MockObject_MockObject
+     * Creates mock object for TransferInterface.
+     *
+     * @return TransferInterface|MockObject
      */
     private function getTransferObjectMock()
     {
@@ -122,6 +132,8 @@ private function getTransferObjectMock()
     }
 
     /**
+     * Creates stub for a response.
+     *
      * @return \stdClass
      */
     private function getResponseObject()
@@ -133,6 +145,8 @@ private function getResponseObject()
     }
 
     /**
+     * Creates stub request data.
+     *
      * @return array
      */
     private function getTransferData()
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionSubmitForSettlementTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionSubmitForSettlementTest.php
index 86113c34ba2..2e778248179 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionSubmitForSettlementTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionSubmitForSettlementTest.php
@@ -8,12 +8,14 @@
 use Braintree\Result\Successful;
 use Magento\Braintree\Gateway\Http\Client\TransactionSubmitForSettlement;
 use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
 use Magento\Payment\Gateway\Http\TransferInterface;
 use Magento\Payment\Model\Method\Logger;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Psr\Log\LoggerInterface;
 
 /**
- * Class TransactionSubmitForSettlementTest
+ * Tests \Magento\Braintree\Gateway\Http\Client\TransactionSubmitForSettlement.
  */
 class TransactionSubmitForSettlementTest extends \PHPUnit\Framework\TestCase
 {
@@ -23,31 +25,39 @@ class TransactionSubmitForSettlementTest extends \PHPUnit\Framework\TestCase
     private $client;
 
     /**
-     * @var Logger|\PHPUnit_Framework_MockObject_MockObject
+     * @var Logger|MockObject
      */
-    private $logger;
+    private $loggerMock;
 
     /**
-     * @var BraintreeAdapter|\PHPUnit_Framework_MockObject_MockObject
+     * @var BraintreeAdapter|MockObject
      */
-    private $adapter;
+    private $adapterMock;
 
     protected function setUp()
     {
+        /** @var LoggerInterface|MockObject $criticalLoggerMock */
         $criticalLoggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
-        $this->logger = $this->getMockBuilder(Logger::class)
+        $this->loggerMock = $this->getMockBuilder(Logger::class)
             ->disableOriginalConstructor()
             ->setMethods(['debug'])
             ->getMock();
-        $this->adapter = $this->getMockBuilder(BraintreeAdapter::class)
+
+        $this->adapterMock = $this->getMockBuilder(BraintreeAdapter::class)
             ->disableOriginalConstructor()
             ->setMethods(['submitForSettlement'])
             ->getMock();
+        /** @var BraintreeAdapterFactory|MockObject $adapterFactoryMock */
+        $adapterFactoryMock = $this->getMockBuilder(BraintreeAdapterFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $adapterFactoryMock->method('create')
+            ->willReturn($this->adapterMock);
 
         $this->client = new TransactionSubmitForSettlement(
             $criticalLoggerMock,
-            $this->logger,
-            $this->adapter
+            $this->loggerMock,
+            $adapterFactoryMock
         );
     }
 
@@ -59,13 +69,13 @@ protected function setUp()
     public function testPlaceRequestWithException()
     {
         $exception = new \Exception('Transaction has been declined');
-        $this->adapter->expects(static::once())
+        $this->adapterMock->expects(static::once())
             ->method('submitForSettlement')
             ->willThrowException($exception);
 
-        /** @var TransferInterface|\PHPUnit_Framework_MockObject_MockObject $transferObjectMock */
-        $transferObjectMock = $this->getTransferObjectMock();
-        $this->client->placeRequest($transferObjectMock);
+        /** @var TransferInterface|MockObject $transferObject */
+        $transferObject = $this->getTransferObjectMock();
+        $this->client->placeRequest($transferObject);
     }
 
     /**
@@ -74,19 +84,21 @@ public function testPlaceRequestWithException()
     public function testPlaceRequest()
     {
         $data = new Successful(['success'], [true]);
-        $this->adapter->expects(static::once())
+        $this->adapterMock->expects(static::once())
             ->method('submitForSettlement')
             ->willReturn($data);
 
-        /** @var TransferInterface|\PHPUnit_Framework_MockObject_MockObject $transferObjectMock */
-        $transferObjectMock = $this->getTransferObjectMock();
-        $response = $this->client->placeRequest($transferObjectMock);
+        /** @var TransferInterface|MockObject $transferObject */
+        $transferObject = $this->getTransferObjectMock();
+        $response = $this->client->placeRequest($transferObject);
         static::assertTrue(is_object($response['object']));
         static::assertEquals(['object' => $data], $response);
     }
 
     /**
-     * @return TransferInterface|\PHPUnit_Framework_MockObject_MockObject
+     * Creates mock for TransferInterface
+     *
+     * @return TransferInterface|MockObject
      */
     private function getTransferObjectMock()
     {
@@ -95,7 +107,7 @@ private function getTransferObjectMock()
             ->method('getBody')
             ->willReturn([
                 'transaction_id' => 'vb4c6b',
-                'amount' => 124.00
+                'amount' => 124.00,
             ]);
 
         return $mock;
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionVoidTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionVoidTest.php
new file mode 100644
index 00000000000..17f63d0659b
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Http/Client/TransactionVoidTest.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\Unit\Gateway\Http\Client;
+
+use Magento\Braintree\Gateway\Http\Client\TransactionVoid;
+use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
+use Magento\Payment\Gateway\Http\TransferInterface;
+use Magento\Payment\Model\Method\Logger;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Tests \Magento\Braintree\Gateway\Http\Client\TransactionVoid.
+ */
+class TransactionVoidTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var TransactionVoid
+     */
+    private $client;
+
+    /**
+     * @var Logger|MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @var BraintreeAdapter|MockObject
+     */
+    private $adapterMock;
+
+    /**
+     * @var string
+     */
+    private $transactionId = 'px4kpev5';
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        /** @var LoggerInterface|MockObject $criticalLoggerMock */
+        $criticalLoggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
+        $this->loggerMock = $this->getMockBuilder(Logger::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->adapterMock = $this->getMockBuilder(BraintreeAdapter::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** @var BraintreeAdapterFactory|MockObject $adapterFactoryMock */
+        $adapterFactoryMock = $this->getMockBuilder(BraintreeAdapterFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $adapterFactoryMock->expects(self::once())
+            ->method('create')
+            ->willReturn($this->adapterMock);
+
+        $this->client = new TransactionVoid($criticalLoggerMock, $this->loggerMock, $adapterFactoryMock);
+    }
+
+    /**
+     * @return void
+     *
+     * @expectedException \Magento\Payment\Gateway\Http\ClientException
+     * @expectedExceptionMessage Test messages
+     */
+    public function testPlaceRequestException()
+    {
+        $this->loggerMock->expects($this->once())
+            ->method('debug')
+            ->with(
+                [
+                    'request' => $this->getTransferData(),
+                    'client' => TransactionVoid::class,
+                    'response' => [],
+                ]
+            );
+
+        $this->adapterMock->expects($this->once())
+            ->method('void')
+            ->with($this->transactionId)
+            ->willThrowException(new \Exception('Test messages'));
+
+        /** @var TransferInterface|MockObject $transferObjectMock */
+        $transferObjectMock = $this->getTransferObjectMock();
+
+        $this->client->placeRequest($transferObjectMock);
+    }
+
+    /**
+     * @return void
+     */
+    public function testPlaceRequestSuccess()
+    {
+        $response = new \stdClass;
+        $response->success = true;
+        $this->adapterMock->expects($this->once())
+            ->method('void')
+            ->with($this->transactionId)
+            ->willReturn($response);
+
+        $this->loggerMock->expects($this->once())
+            ->method('debug')
+            ->with(
+                [
+                    'request' => $this->getTransferData(),
+                    'client' => TransactionVoid::class,
+                    'response' => ['success' => 1],
+                ]
+            );
+
+        $actualResult = $this->client->placeRequest($this->getTransferObjectMock());
+
+        $this->assertTrue(is_object($actualResult['object']));
+        $this->assertEquals(['object' => $response], $actualResult);
+    }
+
+    /**
+     * Creates mock object for TransferInterface.
+     *
+     * @return TransferInterface|MockObject
+     */
+    private function getTransferObjectMock()
+    {
+        $transferObjectMock = $this->createMock(TransferInterface::class);
+        $transferObjectMock->expects($this->once())
+            ->method('getBody')
+            ->willReturn($this->getTransferData());
+
+        return $transferObjectMock;
+    }
+
+    /**
+     * Creates stub request data.
+     *
+     * @return array
+     */
+    private function getTransferData()
+    {
+        return [
+            'transaction_id' => $this->transactionId,
+        ];
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/AddressDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/AddressDataBuilderTest.php
index 3f05aed45da..e1bbf29c636 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/AddressDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/AddressDataBuilderTest.php
@@ -9,20 +9,21 @@
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Payment\Gateway\Data\OrderAdapterInterface;
 use Magento\Payment\Gateway\Data\AddressAdapterInterface;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
- * Class AddressDataBuilderTest
+ * Tests \Magento\Braintree\Gateway\Request\AddressDataBuilder.
  */
 class AddressDataBuilderTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var PaymentDataObjectInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var PaymentDataObjectInterface|MockObject
      */
     private $paymentDOMock;
 
     /**
-     * @var OrderAdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var OrderAdapterInterface|MockObject
      */
     private $orderMock;
 
@@ -32,7 +33,7 @@ class AddressDataBuilderTest extends \PHPUnit\Framework\TestCase
     private $builder;
 
     /**
-     * @var SubjectReader|\PHPUnit_Framework_MockObject_MockObject
+     * @var SubjectReader|MockObject
      */
     private $subjectReaderMock;
 
@@ -138,7 +139,7 @@ public function dataProviderBuild()
                     'city' => 'Chicago',
                     'region_code' => 'IL',
                     'country_id' => 'US',
-                    'post_code' => '00000'
+                    'post_code' => '00000',
                 ],
                 [
                     AddressDataBuilder::SHIPPING_ADDRESS => [
@@ -150,7 +151,7 @@ public function dataProviderBuild()
                         AddressDataBuilder::LOCALITY => 'Chicago',
                         AddressDataBuilder::REGION => 'IL',
                         AddressDataBuilder::POSTAL_CODE => '00000',
-                        AddressDataBuilder::COUNTRY_CODE => 'US'
+                        AddressDataBuilder::COUNTRY_CODE => 'US',
 
                     ],
                     AddressDataBuilder::BILLING_ADDRESS => [
@@ -162,46 +163,46 @@ public function dataProviderBuild()
                         AddressDataBuilder::LOCALITY => 'Chicago',
                         AddressDataBuilder::REGION => 'IL',
                         AddressDataBuilder::POSTAL_CODE => '00000',
-                        AddressDataBuilder::COUNTRY_CODE => 'US'
-                    ]
-                ]
-            ]
+                        AddressDataBuilder::COUNTRY_CODE => 'US',
+                    ],
+                ],
+            ],
         ];
     }
 
     /**
      * @param array $addressData
-     * @return AddressAdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @return AddressAdapterInterface|MockObject
      */
     private function getAddressMock($addressData)
     {
         $addressMock = $this->createMock(AddressAdapterInterface::class);
 
-        $addressMock->expects(static::exactly(2))
+        $addressMock->expects(self::exactly(2))
             ->method('getFirstname')
             ->willReturn($addressData['first_name']);
-        $addressMock->expects(static::exactly(2))
+        $addressMock->expects(self::exactly(2))
             ->method('getLastname')
             ->willReturn($addressData['last_name']);
-        $addressMock->expects(static::exactly(2))
+        $addressMock->expects(self::exactly(2))
             ->method('getCompany')
             ->willReturn($addressData['company']);
-        $addressMock->expects(static::exactly(2))
+        $addressMock->expects(self::exactly(2))
             ->method('getStreetLine1')
             ->willReturn($addressData['street_1']);
-        $addressMock->expects(static::exactly(2))
+        $addressMock->expects(self::exactly(2))
             ->method('getStreetLine2')
             ->willReturn($addressData['street_2']);
-        $addressMock->expects(static::exactly(2))
+        $addressMock->expects(self::exactly(2))
             ->method('getCity')
             ->willReturn($addressData['city']);
-        $addressMock->expects(static::exactly(2))
+        $addressMock->expects(self::exactly(2))
             ->method('getRegionCode')
             ->willReturn($addressData['region_code']);
-        $addressMock->expects(static::exactly(2))
+        $addressMock->expects(self::exactly(2))
             ->method('getPostcode')
             ->willReturn($addressData['post_code']);
-        $addressMock->expects(static::exactly(2))
+        $addressMock->expects(self::exactly(2))
             ->method('getCountryId')
             ->willReturn($addressData['country_id']);
 
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/CaptureDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/CaptureDataBuilderTest.php
index 9799b6f18c6..84558be0dab 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/CaptureDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/CaptureDataBuilderTest.php
@@ -8,37 +8,38 @@
 use Magento\Braintree\Gateway\Request\CaptureDataBuilder;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Sales\Model\Order\Payment;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
- * Class CaptureDataBuilderTest
+ * Tests \Magento\Braintree\Gateway\Request\CaptureDataBuilder.
  */
 class CaptureDataBuilderTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Braintree\Gateway\Request\CaptureDataBuilder
+     * @var CaptureDataBuilder
      */
     private $builder;
 
     /**
-     * @var Payment|\PHPUnit_Framework_MockObject_MockObject
+     * @var Payment|MockObject
      */
-    private $payment;
+    private $paymentMock;
 
     /**
-     * @var \Magento\Sales\Model\Order\Payment|\PHPUnit_Framework_MockObject_MockObject
+     * @var Payment|MockObject
      */
-    private $paymentDO;
+    private $paymentDOMock;
 
     /**
-     * @var SubjectReader|\PHPUnit_Framework_MockObject_MockObject
+     * @var SubjectReader|MockObject
      */
     private $subjectReaderMock;
 
     protected function setUp()
     {
-        $this->paymentDO = $this->createMock(PaymentDataObjectInterface::class);
-        $this->payment = $this->getMockBuilder(Payment::class)
+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
+        $this->paymentMock = $this->getMockBuilder(Payment::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->subjectReaderMock = $this->getMockBuilder(SubjectReader::class)
@@ -57,22 +58,22 @@ public function testBuildWithException()
     {
         $amount = 10.00;
         $buildSubject = [
-            'payment' => $this->paymentDO,
-            'amount' => $amount
+            'payment' => $this->paymentDOMock,
+            'amount' => $amount,
         ];
 
-        $this->payment->expects(static::once())
+        $this->paymentMock->expects(self::once())
             ->method('getCcTransId')
             ->willReturn('');
 
-        $this->paymentDO->expects(static::once())
+        $this->paymentDOMock->expects(self::once())
             ->method('getPayment')
-            ->willReturn($this->payment);
+            ->willReturn($this->paymentMock);
 
         $this->subjectReaderMock->expects(self::once())
             ->method('readPayment')
             ->with($buildSubject)
-            ->willReturn($this->paymentDO);
+            ->willReturn($this->paymentDOMock);
 
         $this->builder->build($buildSubject);
     }
@@ -87,26 +88,26 @@ public function testBuild()
 
         $expected = [
             'transaction_id' => $transactionId,
-            'amount' => $amount
+            'amount' => $amount,
         ];
 
         $buildSubject = [
-            'payment' => $this->paymentDO,
-            'amount' => $amount
+            'payment' => $this->paymentDOMock,
+            'amount' => $amount,
         ];
 
-        $this->payment->expects(static::once())
+        $this->paymentMock->expects(self::once())
             ->method('getCcTransId')
             ->willReturn($transactionId);
 
-        $this->paymentDO->expects(static::once())
+        $this->paymentDOMock->expects(self::once())
             ->method('getPayment')
-            ->willReturn($this->payment);
+            ->willReturn($this->paymentMock);
 
         $this->subjectReaderMock->expects(self::once())
             ->method('readPayment')
             ->with($buildSubject)
-            ->willReturn($this->paymentDO);
+            ->willReturn($this->paymentDOMock);
         $this->subjectReaderMock->expects(self::once())
             ->method('readAmount')
             ->with($buildSubject)
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/CustomerDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/CustomerDataBuilderTest.php
index 0f25b26fd2f..b19715cf920 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/CustomerDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/CustomerDataBuilderTest.php
@@ -9,20 +9,21 @@
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Payment\Gateway\Data\OrderAdapterInterface;
 use Magento\Payment\Gateway\Data\AddressAdapterInterface;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
- * Class CustomerDataBuilderTest
+ * Tests \Magento\Braintree\Gateway\Request\CustomerDataBuilder.
  */
 class CustomerDataBuilderTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var PaymentDataObjectInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var PaymentDataObjectInterface|MockObject
      */
     private $paymentDOMock;
 
     /**
-     * @var OrderAdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var OrderAdapterInterface|MockObject
      */
     private $orderMock;
 
@@ -32,7 +33,7 @@ class CustomerDataBuilderTest extends \PHPUnit\Framework\TestCase
     private $builder;
 
     /**
-     * @var SubjectReader|\PHPUnit_Framework_MockObject_MockObject
+     * @var SubjectReader|MockObject
      */
     private $subjectReaderMock;
 
@@ -105,7 +106,7 @@ public function dataProviderBuild()
                     'last_name' => 'Smith',
                     'company' => 'Magento',
                     'phone' => '555-555-555',
-                    'email' => 'john@magento.com'
+                    'email' => 'john@magento.com',
                 ],
                 [
                     CustomerDataBuilder::CUSTOMER => [
@@ -114,15 +115,15 @@ public function dataProviderBuild()
                         CustomerDataBuilder::COMPANY => 'Magento',
                         CustomerDataBuilder::PHONE => '555-555-555',
                         CustomerDataBuilder::EMAIL => 'john@magento.com',
-                    ]
-                ]
-            ]
+                    ],
+                ],
+            ],
         ];
     }
 
     /**
      * @param array $billingData
-     * @return AddressAdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @return AddressAdapterInterface|MockObject
      */
     private function getBillingMock($billingData)
     {
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/DescriptorDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/DescriptorDataBuilderTest.php
index 761d88b636e..1a87e5254bc 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/DescriptorDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/DescriptorDataBuilderTest.php
@@ -7,6 +7,9 @@
 
 use Magento\Braintree\Gateway\Config\Config;
 use Magento\Braintree\Gateway\Request\DescriptorDataBuilder;
+use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Payment\Gateway\Data\OrderAdapterInterface;
+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
@@ -14,10 +17,15 @@
  */
 class DescriptorDataBuilderTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @var SubjectReader|MockObject
+     */
+    private $subjectReaderMock;
+
     /**
      * @var Config|MockObject
      */
-    private $config;
+    private $configMock;
 
     /**
      * @var DescriptorDataBuilder
@@ -26,27 +34,41 @@ class DescriptorDataBuilderTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->config = $this->getMockBuilder(Config::class)
+        $this->configMock = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->setMethods(['getDynamicDescriptors'])
             ->getMock();
+        $this->subjectReaderMock = $this->getMockBuilder(SubjectReader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $this->builder = new DescriptorDataBuilder($this->config);
+        $this->builder = new DescriptorDataBuilder($this->configMock, $this->subjectReaderMock);
     }
 
     /**
-     * @covers \Magento\Braintree\Gateway\Request\DescriptorDataBuilder::build
      * @param array $descriptors
      * @param array $expected
      * @dataProvider buildDataProvider
      */
     public function testBuild(array $descriptors, array $expected)
     {
-        $this->config->expects(static::once())
-            ->method('getDynamicDescriptors')
-            ->willReturn($descriptors);
+        $paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
+        $buildSubject = [
+            'payment' => $paymentDOMock,
+        ];
+        $this->subjectReaderMock->expects(self::once())
+            ->method('readPayment')
+            ->with($buildSubject)
+            ->willReturn($paymentDOMock);
+
+        $order = $this->createMock(OrderAdapterInterface::class);
+        $order->expects(self::once())->method('getStoreId')->willReturn('1');
+
+        $paymentDOMock->expects(self::once())->method('getOrder')->willReturn($order);
+
+        $this->configMock->method('getDynamicDescriptors')->willReturn($descriptors);
 
-        $actual = $this->builder->build([]);
+        $actual = $this->builder->build(['payment' => $paymentDOMock]);
         static::assertEquals($expected, $actual);
     }
 
@@ -64,42 +86,42 @@ public function buildDataProvider()
                 'descriptors' => [
                     'name' => $name,
                     'phone' => $phone,
-                    'url' => $url
+                    'url' => $url,
                 ],
                 'expected' => [
                     'descriptor' => [
                         'name' => $name,
                         'phone' => $phone,
-                        'url' => $url
-                    ]
-                ]
+                        'url' => $url,
+                    ],
+                ],
             ],
             [
                 'descriptors' => [
                     'name' => $name,
-                    'phone' => $phone
+                    'phone' => $phone,
                 ],
                 'expected' => [
                     'descriptor' => [
                         'name' => $name,
-                        'phone' => $phone
-                    ]
-                ]
+                        'phone' => $phone,
+                    ],
+                ],
             ],
             [
                 'descriptors' => [
-                    'name' => $name
+                    'name' => $name,
                 ],
                 'expected' => [
                     'descriptor' => [
-                        'name' => $name
-                    ]
-                ]
+                        'name' => $name,
+                    ],
+                ],
             ],
             [
                 'descriptors' => [],
-                'expected' => []
-            ]
+                'expected' => [],
+            ],
         ];
     }
 }
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/KountPaymentDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/KountPaymentDataBuilderTest.php
index ee0907a1ddb..6a4aeacba4f 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/KountPaymentDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/KountPaymentDataBuilderTest.php
@@ -5,17 +5,17 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Request;
 
+use Magento\Payment\Gateway\Data\OrderAdapterInterface;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Braintree\Gateway\Config\Config;
 use Magento\Braintree\Observer\DataAssignObserver;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Braintree\Gateway\Request\KountPaymentDataBuilder;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
- * Class KountPaymentDataBuilderTest
- *
- * @see \Magento\Braintree\Gateway\Request\KountPaymentDataBuilder
+ * Tests \Magento\Braintree\Gateway\Request\KountPaymentDataBuilder.
  */
 class KountPaymentDataBuilderTest extends \PHPUnit\Framework\TestCase
 {
@@ -27,19 +27,19 @@ class KountPaymentDataBuilderTest extends \PHPUnit\Framework\TestCase
     private $builder;
 
     /**
-     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var Config|MockObject
      */
     private $configMock;
 
     /**
-     * @var Payment|\PHPUnit_Framework_MockObject_MockObject
+     * @var Payment|MockObject
      */
     private $paymentMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var PaymentDataObjectInterface|MockObject
      */
-    private $paymentDO;
+    private $paymentDOMock;
 
     /**
      * @var SubjectReader|\PHPUnit_Framework_MockObject_MockObject
@@ -48,7 +48,7 @@ class KountPaymentDataBuilderTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->paymentDO = $this->createMock(PaymentDataObjectInterface::class);
+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
         $this->configMock = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -69,7 +69,7 @@ public function testBuildReadPaymentException()
     {
         $buildSubject = [];
 
-        $this->configMock->expects(static::once())
+        $this->configMock->expects(self::never())
             ->method('hasFraudProtection')
             ->willReturn(true);
 
@@ -84,31 +84,34 @@ public function testBuildReadPaymentException()
     public function testBuild()
     {
         $additionalData = [
-            DataAssignObserver::DEVICE_DATA => self::DEVICE_DATA
+            DataAssignObserver::DEVICE_DATA => self::DEVICE_DATA,
         ];
 
         $expectedResult = [
             KountPaymentDataBuilder::DEVICE_DATA => self::DEVICE_DATA,
         ];
 
-        $buildSubject = ['payment' => $this->paymentDO];
+        $order = $this->createMock(OrderAdapterInterface::class);
+        $this->paymentDOMock->expects(self::once())->method('getOrder')->willReturn($order);
 
-        $this->paymentMock->expects(static::exactly(count($additionalData)))
+        $buildSubject = ['payment' => $this->paymentDOMock];
+
+        $this->paymentMock->expects(self::exactly(count($additionalData)))
             ->method('getAdditionalInformation')
             ->willReturn($additionalData);
 
-        $this->configMock->expects(static::once())
+        $this->configMock->expects(self::once())
             ->method('hasFraudProtection')
             ->willReturn(true);
 
-        $this->paymentDO->expects(static::once())
+        $this->paymentDOMock->expects(self::once())
             ->method('getPayment')
             ->willReturn($this->paymentMock);
 
         $this->subjectReaderMock->expects(self::once())
             ->method('readPayment')
             ->with($buildSubject)
-            ->willReturn($this->paymentDO);
+            ->willReturn($this->paymentDOMock);
 
         static::assertEquals(
             $expectedResult,
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/DeviceDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/DeviceDataBuilderTest.php
index fba65354d60..c618ab66b95 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/DeviceDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/DeviceDataBuilderTest.php
@@ -5,31 +5,31 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Request\PayPal;
 
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Request\PayPal\DeviceDataBuilder;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Payment\Model\InfoInterface;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
- * Class DeviceDataBuilderTest
+ * Tests \Magento\Braintree\Gateway\Request\PayPal\DeviceDataBuilder.
  */
 class DeviceDataBuilderTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var SubjectReader|MockObject
      */
-    private $subjectReader;
+    private $subjectReaderMock;
 
     /**
      * @var PaymentDataObjectInterface|MockObject
      */
-    private $paymentDataObject;
+    private $paymentDataObjectMock;
 
     /**
      * @var InfoInterface|MockObject
      */
-    private $paymentInfo;
+    private $paymentInfoMock;
 
     /**
      * @var DeviceDataBuilder
@@ -38,16 +38,16 @@ class DeviceDataBuilderTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->subjectReader = $this->getMockBuilder(SubjectReader::class)
+        $this->subjectReaderMock = $this->getMockBuilder(SubjectReader::class)
             ->disableOriginalConstructor()
             ->setMethods(['readPayment'])
             ->getMock();
 
-        $this->paymentDataObject = $this->createMock(PaymentDataObjectInterface::class);
+        $this->paymentDataObjectMock = $this->createMock(PaymentDataObjectInterface::class);
 
-        $this->paymentInfo = $this->createMock(InfoInterface::class);
+        $this->paymentInfoMock = $this->createMock(InfoInterface::class);
         
-        $this->builder = new DeviceDataBuilder($this->subjectReader);
+        $this->builder = new DeviceDataBuilder($this->subjectReaderMock);
     }
 
     /**
@@ -59,19 +59,19 @@ protected function setUp()
     public function testBuild(array $paymentData, array $expected)
     {
         $subject = [
-            'payment' => $this->paymentDataObject
+            'payment' => $this->paymentDataObjectMock,
         ];
 
-        $this->subjectReader->expects(static::once())
+        $this->subjectReaderMock->expects(static::once())
             ->method('readPayment')
             ->with($subject)
-            ->willReturn($this->paymentDataObject);
+            ->willReturn($this->paymentDataObjectMock);
 
-        $this->paymentDataObject->expects(static::once())
+        $this->paymentDataObjectMock->expects(static::once())
             ->method('getPayment')
-            ->willReturn($this->paymentInfo);
+            ->willReturn($this->paymentInfoMock);
 
-        $this->paymentInfo->expects(static::once())
+        $this->paymentInfoMock->expects(static::once())
             ->method('getAdditionalInformation')
             ->willReturn($paymentData);
 
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/VaultDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/VaultDataBuilderTest.php
index 8e83254727b..5595d5172b1 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/VaultDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PayPal/VaultDataBuilderTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Request\PayPal;
 
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Request\PayPal\VaultDataBuilder;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Payment\Model\InfoInterface;
@@ -13,24 +13,24 @@
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
- * Class VaultDataBuilderTest
+ * Tests \Magento\Braintree\Gateway\Request\PayPal\VaultDataBuilder.
  */
 class VaultDataBuilderTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var SubjectReader|MockObject
      */
-    private $subjectReader;
+    private $subjectReaderMock;
 
     /**
      * @var PaymentDataObjectInterface|MockObject
      */
-    private $paymentDataObject;
+    private $paymentDataObjectMock;
 
     /**
      * @var InfoInterface|MockObject
      */
-    private $paymentInfo;
+    private $paymentInfoMock;
 
     /**
      * @var VaultDataBuilder
@@ -39,16 +39,16 @@ class VaultDataBuilderTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->paymentDataObject = $this->createMock(PaymentDataObjectInterface::class);
+        $this->paymentDataObjectMock = $this->createMock(PaymentDataObjectInterface::class);
 
-        $this->paymentInfo = $this->createMock(InfoInterface::class);
+        $this->paymentInfoMock = $this->createMock(InfoInterface::class);
 
-        $this->subjectReader = $this->getMockBuilder(SubjectReader::class)
+        $this->subjectReaderMock = $this->getMockBuilder(SubjectReader::class)
             ->disableOriginalConstructor()
             ->setMethods(['readPayment'])
             ->getMock();
 
-        $this->builder = new VaultDataBuilder($this->subjectReader);
+        $this->builder = new VaultDataBuilder($this->subjectReaderMock);
     }
 
     /**
@@ -60,19 +60,19 @@ protected function setUp()
     public function testBuild(array $additionalInfo, array $expected)
     {
         $subject = [
-            'payment' => $this->paymentDataObject
+            'payment' => $this->paymentDataObjectMock,
         ];
 
-        $this->subjectReader->expects(static::once())
+        $this->subjectReaderMock->expects(static::once())
             ->method('readPayment')
             ->with($subject)
-            ->willReturn($this->paymentDataObject);
+            ->willReturn($this->paymentDataObjectMock);
 
-        $this->paymentDataObject->expects(static::once())
+        $this->paymentDataObjectMock->expects(static::once())
             ->method('getPayment')
-            ->willReturn($this->paymentInfo);
+            ->willReturn($this->paymentInfoMock);
 
-        $this->paymentInfo->expects(static::once())
+        $this->paymentInfoMock->expects(static::once())
             ->method('getAdditionalInformation')
             ->willReturn($additionalInfo);
 
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
index 12c613b8f21..76ab8b8b53b 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/PaymentDataBuilderTest.php
@@ -6,17 +6,16 @@
 namespace Magento\Braintree\Test\Unit\Gateway\Request;
 
 use Magento\Braintree\Gateway\Config\Config;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Request\PaymentDataBuilder;
 use Magento\Braintree\Observer\DataAssignObserver;
 use Magento\Payment\Gateway\Data\OrderAdapterInterface;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Sales\Model\Order\Payment;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
- * Class PaymentDataBuilderTest
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * Tests \Magento\Braintree\Gateway\Request\PaymentDataBuilder.
  */
 class PaymentDataBuilderTest extends \PHPUnit\Framework\TestCase
 {
@@ -29,33 +28,33 @@ class PaymentDataBuilderTest extends \PHPUnit\Framework\TestCase
     private $builder;
 
     /**
-     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var Config|MockObject
      */
     private $configMock;
 
     /**
-     * @var Payment|\PHPUnit_Framework_MockObject_MockObject
+     * @var Payment|MockObject
      */
     private $paymentMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var PaymentDataObjectInterface|MockObject
      */
-    private $paymentDO;
+    private $paymentDOMock;
 
     /**
-     * @var SubjectReader|\PHPUnit_Framework_MockObject_MockObject
+     * @var SubjectReader|MockObject
      */
     private $subjectReaderMock;
 
     /**
-     * @var OrderAdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var OrderAdapterInterface|MockObject
      */
     private $orderMock;
 
     protected function setUp()
     {
-        $this->paymentDO = $this->createMock(PaymentDataObjectInterface::class);
+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
         $this->configMock = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -91,14 +90,14 @@ public function testBuildReadPaymentException()
     public function testBuildReadAmountException()
     {
         $buildSubject = [
-            'payment' => $this->paymentDO,
-            'amount' => null
+            'payment' => $this->paymentDOMock,
+            'amount' => null,
         ];
 
         $this->subjectReaderMock->expects(self::once())
             ->method('readPayment')
             ->with($buildSubject)
-            ->willReturn($this->paymentDO);
+            ->willReturn($this->paymentDOMock);
         $this->subjectReaderMock->expects(self::once())
             ->method('readAmount')
             ->with($buildSubject)
@@ -112,8 +111,8 @@ public function testBuild()
         $additionalData = [
             [
                 DataAssignObserver::PAYMENT_METHOD_NONCE,
-                self::PAYMENT_METHOD_NONCE
-            ]
+                self::PAYMENT_METHOD_NONCE,
+            ],
         ];
 
         $expectedResult = [
@@ -124,40 +123,40 @@ public function testBuild()
         ];
 
         $buildSubject = [
-            'payment' => $this->paymentDO,
-            'amount' => 10.00
+            'payment' => $this->paymentDOMock,
+            'amount' => 10.00,
         ];
 
-        $this->paymentMock->expects(static::exactly(count($additionalData)))
+        $this->paymentMock->expects(self::exactly(count($additionalData)))
             ->method('getAdditionalInformation')
             ->willReturnMap($additionalData);
 
-        $this->configMock->expects(static::once())
+        $this->configMock->expects(self::once())
             ->method('getMerchantAccountId')
             ->willReturn(self::MERCHANT_ACCOUNT_ID);
 
-        $this->paymentDO->expects(static::once())
+        $this->paymentDOMock->expects(self::once())
             ->method('getPayment')
             ->willReturn($this->paymentMock);
 
-        $this->paymentDO->expects(static::once())
+        $this->paymentDOMock->expects(self::once())
             ->method('getOrder')
             ->willReturn($this->orderMock);
 
         $this->subjectReaderMock->expects(self::once())
             ->method('readPayment')
             ->with($buildSubject)
-            ->willReturn($this->paymentDO);
+            ->willReturn($this->paymentDOMock);
         $this->subjectReaderMock->expects(self::once())
             ->method('readAmount')
             ->with($buildSubject)
             ->willReturn(10.00);
 
-        $this->orderMock->expects(static::once())
+        $this->orderMock->expects(self::once())
             ->method('getOrderIncrementId')
             ->willReturn('000000101');
 
-        static::assertEquals(
+        self::assertEquals(
             $expectedResult,
             $this->builder->build($buildSubject)
         );
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/RefundDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/RefundDataBuilderTest.php
index 5aa383d095a..dffe293c5a3 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/RefundDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/RefundDataBuilderTest.php
@@ -5,65 +5,78 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Request;
 
-use Magento\Braintree\Gateway\Helper\SubjectReader;
 use Magento\Braintree\Gateway\Request\PaymentDataBuilder;
 use Magento\Braintree\Gateway\Request\RefundDataBuilder;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Sales\Api\Data\TransactionInterface;
 use Magento\Sales\Model\Order\Payment;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
+/**
+ * Tests \Magento\Braintree\Gateway\Request\RefundDataBuilder.
+ */
 class RefundDataBuilderTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var SubjectReader | \PHPUnit_Framework_MockObject_MockObject
+     * @var SubjectReader|MockObject
+     */
+    private $subjectReaderMock;
+
+    /**
+     * @var PaymentDataObjectInterface|MockObject
+     */
+    private $paymentDOMock;
+
+    /**
+     * @var Payment|MockObject
      */
-    private $subjectReader;
+    private $paymentModelMock;
 
     /**
      * @var RefundDataBuilder
      */
     private $dataBuilder;
 
+    /**
+     * @var string
+     */
+    private $transactionId = 'xsd7n';
+
     public function setUp()
     {
-        $this->subjectReader = $this->getMockBuilder(
-            SubjectReader::class
-        )->disableOriginalConstructor()
+        $this->paymentModelMock = $this->getMockBuilder(Payment::class)
+            ->disableOriginalConstructor()
             ->getMock();
 
-        $this->dataBuilder = new RefundDataBuilder($this->subjectReader);
+        $this->subjectReaderMock = $this->getMockBuilder(SubjectReader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->dataBuilder = new RefundDataBuilder($this->subjectReaderMock);
     }
 
     public function testBuild()
     {
-        $paymentDO = $this->createMock(PaymentDataObjectInterface::class);
-        $paymentModel = $this->getMockBuilder(
-            Payment::class
-        )->disableOriginalConstructor()
-            ->getMock();
+        $this->initPaymentDOMock();
+        $buildSubject = ['payment' => $this->paymentDOMock, 'amount' => 12.358];
 
-        $buildSubject = ['payment' => $paymentDO, 'amount' => 12.358];
-        $transactionId = 'xsd7n';
-
-        $this->subjectReader->expects(static::once())
+        $this->subjectReaderMock->expects(self::once())
             ->method('readPayment')
             ->with($buildSubject)
-            ->willReturn($paymentDO);
-        $paymentDO->expects(static::once())
-            ->method('getPayment')
-            ->willReturn($paymentModel);
-        $paymentModel->expects(static::once())
+            ->willReturn($this->paymentDOMock);
+        $this->paymentModelMock->expects(self::once())
             ->method('getParentTransactionId')
-            ->willReturn($transactionId);
-        $this->subjectReader->expects(static::once())
+            ->willReturn($this->transactionId);
+        $this->subjectReaderMock->expects(self::once())
             ->method('readAmount')
             ->with($buildSubject)
             ->willReturn($buildSubject['amount']);
 
         static::assertEquals(
             [
-                'transaction_id' => $transactionId,
-                PaymentDataBuilder::AMOUNT => '12.36'
+                'transaction_id' => $this->transactionId,
+                PaymentDataBuilder::AMOUNT => '12.36',
             ],
             $this->dataBuilder->build($buildSubject)
         );
@@ -71,34 +84,25 @@ public function testBuild()
 
     public function testBuildNullAmount()
     {
-        $paymentDO = $this->createMock(PaymentDataObjectInterface::class);
-        $paymentModel = $this->getMockBuilder(
-            Payment::class
-        )->disableOriginalConstructor()
-            ->getMock();
-
-        $buildSubject = ['payment' => $paymentDO];
-        $transactionId = 'xsd7n';
+        $this->initPaymentDOMock();
+        $buildSubject = ['payment' => $this->paymentDOMock];
 
-        $this->subjectReader->expects(static::once())
+        $this->subjectReaderMock->expects(self::once())
             ->method('readPayment')
             ->with($buildSubject)
-            ->willReturn($paymentDO);
-        $paymentDO->expects(static::once())
-            ->method('getPayment')
-            ->willReturn($paymentModel);
-        $paymentModel->expects(static::once())
+            ->willReturn($this->paymentDOMock);
+        $this->paymentModelMock->expects(self::once())
             ->method('getParentTransactionId')
-            ->willReturn($transactionId);
-        $this->subjectReader->expects(static::once())
+            ->willReturn($this->transactionId);
+        $this->subjectReaderMock->expects(self::once())
             ->method('readAmount')
             ->with($buildSubject)
             ->willThrowException(new \InvalidArgumentException());
 
         static::assertEquals(
             [
-                'transaction_id' => $transactionId,
-                PaymentDataBuilder::AMOUNT => null
+                'transaction_id' => $this->transactionId,
+                PaymentDataBuilder::AMOUNT => null,
             ],
             $this->dataBuilder->build($buildSubject)
         );
@@ -106,37 +110,41 @@ public function testBuildNullAmount()
 
     public function testBuildCutOffLegacyTransactionIdPostfix()
     {
-        $paymentDO = $this->createMock(PaymentDataObjectInterface::class);
-        $paymentModel = $this->getMockBuilder(
-            Payment::class
-        )->disableOriginalConstructor()
-            ->getMock();
-
-        $buildSubject = ['payment' => $paymentDO];
+        $this->initPaymentDOMock();
+        $buildSubject = ['payment' => $this->paymentDOMock];
         $legacyTxnId = 'xsd7n-' . TransactionInterface::TYPE_CAPTURE;
-        $transactionId = 'xsd7n';
 
-        $this->subjectReader->expects(static::once())
+        $this->subjectReaderMock->expects(self::once())
             ->method('readPayment')
             ->with($buildSubject)
-            ->willReturn($paymentDO);
-        $paymentDO->expects(static::once())
-            ->method('getPayment')
-            ->willReturn($paymentModel);
-        $paymentModel->expects(static::once())
+            ->willReturn($this->paymentDOMock);
+        $this->paymentModelMock->expects(self::once())
             ->method('getParentTransactionId')
             ->willReturn($legacyTxnId);
-        $this->subjectReader->expects(static::once())
+        $this->subjectReaderMock->expects(self::once())
             ->method('readAmount')
             ->with($buildSubject)
             ->willThrowException(new \InvalidArgumentException());
 
         static::assertEquals(
             [
-                'transaction_id' => $transactionId,
-                PaymentDataBuilder::AMOUNT => null
+                'transaction_id' => $this->transactionId,
+                PaymentDataBuilder::AMOUNT => null,
             ],
             $this->dataBuilder->build($buildSubject)
         );
     }
+
+    /**
+     * Creates mock object for PaymentDataObjectInterface
+     *
+     * @return PaymentDataObjectInterface|MockObject
+     */
+    private function initPaymentDOMock()
+    {
+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
+        $this->paymentDOMock->expects(self::once())
+            ->method('getPayment')
+            ->willReturn($this->paymentModelMock);
+    }
 }
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/ThreeDSecureDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/ThreeDSecureDataBuilderTest.php
index c28ac0c3ac3..f12d1365d0b 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/ThreeDSecureDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/ThreeDSecureDataBuilderTest.php
@@ -6,14 +6,15 @@
 namespace Magento\Braintree\Test\Unit\Gateway\Request;
 
 use Magento\Braintree\Gateway\Config\Config;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Request\ThreeDSecureDataBuilder;
-use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
-use Magento\Payment\Gateway\Data\Order\OrderAdapter;
 use Magento\Payment\Gateway\Data\Order\AddressAdapter;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Payment\Gateway\Data\Order\OrderAdapter;
+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
- * Class ThreeDSecureDataBuilderTest
+ * Tests \Magento\Braintree\Gateway\Request\ThreeDSecureDataBuilder.
  */
 class ThreeDSecureDataBuilderTest extends \PHPUnit\Framework\TestCase
 {
@@ -23,41 +24,49 @@ class ThreeDSecureDataBuilderTest extends \PHPUnit\Framework\TestCase
     private $builder;
 
     /**
-     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var Config|MockObject
      */
     private $configMock;
 
     /**
-     * @var PaymentDataObjectInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var PaymentDataObjectInterface|MockObject
      */
-    private $paymentDO;
+    private $paymentDOMock;
 
     /**
-     * @var OrderAdapter|\PHPUnit_Framework_MockObject_MockObject
+     * @var OrderAdapter|MockObject
      */
-    private $order;
+    private $orderMock;
 
     /**
-     * @var \Magento\Payment\Gateway\Data\Order\AddressAdapter|\PHPUnit_Framework_MockObject_MockObject
+     * @var AddressAdapter|MockObject
      */
-    private $billingAddress;
+    private $billingAddressMock;
 
     /**
      * @var SubjectReader|\PHPUnit_Framework_MockObject_MockObject
      */
     private $subjectReaderMock;
 
+    /**
+     * @var int
+     */
+    private $storeId = 1;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
         $this->initOrderMock();
 
-        $this->paymentDO = $this->getMockBuilder(PaymentDataObjectInterface::class)
+        $this->paymentDOMock = $this->getMockBuilder(PaymentDataObjectInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['getOrder', 'getPayment'])
             ->getMock();
-        $this->paymentDO->expects(static::once())
+        $this->paymentDOMock->expects(static::once())
             ->method('getOrder')
-            ->willReturn($this->order);
+            ->willReturn($this->orderMock);
 
         $this->configMock = $this->getMockBuilder(Config::class)
             ->setMethods(['isVerify3DSecure', 'getThresholdAmount', 'get3DSecureSpecificCountries'])
@@ -82,41 +91,45 @@ protected function setUp()
     public function testBuild($verify, $thresholdAmount, $countryId, array $countries, array $expected)
     {
         $buildSubject = [
-            'payment' => $this->paymentDO,
-            'amount' => 25
+            'payment' => $this->paymentDOMock,
+            'amount' => 25,
         ];
 
         $this->configMock->expects(static::once())
             ->method('isVerify3DSecure')
+            ->with(self::equalTo($this->storeId))
             ->willReturn($verify);
 
         $this->configMock->expects(static::any())
             ->method('getThresholdAmount')
+            ->with(self::equalTo($this->storeId))
             ->willReturn($thresholdAmount);
 
         $this->configMock->expects(static::any())
             ->method('get3DSecureSpecificCountries')
+            ->with(self::equalTo($this->storeId))
             ->willReturn($countries);
 
-        $this->billingAddress->expects(static::any())
+        $this->billingAddressMock->expects(static::any())
             ->method('getCountryId')
             ->willReturn($countryId);
 
         $this->subjectReaderMock->expects(self::once())
             ->method('readPayment')
             ->with($buildSubject)
-            ->willReturn($this->paymentDO);
+            ->willReturn($this->paymentDOMock);
         $this->subjectReaderMock->expects(self::once())
             ->method('readAmount')
             ->with($buildSubject)
             ->willReturn(25);
 
         $result = $this->builder->build($buildSubject);
-        static::assertEquals($expected, $result);
+        self::assertEquals($expected, $result);
     }
 
     /**
-     * Get list of variations for build test
+     * Gets list of variations to build request data.
+     *
      * @return array
      */
     public function buildDataProvider()
@@ -144,22 +157,26 @@ public function buildDataProvider()
     }
 
     /**
-     * Create mock object for order adapter
+     * Creates mock object for order adapter.
+     *
+     * @return void
      */
     private function initOrderMock()
     {
-        $this->billingAddress = $this->getMockBuilder(AddressAdapter::class)
+        $this->billingAddressMock = $this->getMockBuilder(AddressAdapter::class)
             ->disableOriginalConstructor()
             ->setMethods(['getCountryId'])
             ->getMock();
 
-        $this->order = $this->getMockBuilder(OrderAdapter::class)
+        $this->orderMock = $this->getMockBuilder(OrderAdapter::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getBillingAddress'])
+            ->setMethods(['getBillingAddress', 'getStoreId'])
             ->getMock();
 
-        $this->order->expects(static::any())
+        $this->orderMock->expects(static::any())
             ->method('getBillingAddress')
-            ->willReturn($this->billingAddress);
+            ->willReturn($this->billingAddressMock);
+        $this->orderMock->method('getStoreId')
+            ->willReturn($this->storeId);
     }
 }
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php
index df11938ddba..25ccd8b32d1 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VaultCaptureDataBuilderTest.php
@@ -5,13 +5,17 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Request;
 
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Request\VaultCaptureDataBuilder;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Sales\Api\Data\OrderPaymentExtension;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Vault\Model\PaymentToken;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
+/**
+ * Tests \Magento\Braintree\Gateway\Request\VaultCaptureDataBuilder.
+ */
 class VaultCaptureDataBuilderTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -20,35 +24,38 @@ class VaultCaptureDataBuilderTest extends \PHPUnit\Framework\TestCase
     private $builder;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var PaymentDataObjectInterface|MockObject
      */
-    private $paymentDO;
+    private $paymentDOMock;
 
     /**
-     * @var Payment|\PHPUnit_Framework_MockObject_MockObject
+     * @var Payment|MockObject
      */
-    private $payment;
+    private $paymentMock;
 
     /**
      * @var SubjectReader|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $subjectReader;
+    private $subjectReaderMock;
 
-    public function setUp()
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
     {
-        $this->paymentDO = $this->createMock(PaymentDataObjectInterface::class);
-        $this->payment = $this->getMockBuilder(Payment::class)
+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
+        $this->paymentMock = $this->getMockBuilder(Payment::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->paymentDO->expects(static::once())
+        $this->paymentDOMock->expects(static::once())
             ->method('getPayment')
-            ->willReturn($this->payment);
+            ->willReturn($this->paymentMock);
 
-        $this->subjectReader = $this->getMockBuilder(SubjectReader::class)
+        $this->subjectReaderMock = $this->getMockBuilder(SubjectReader::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->builder = new VaultCaptureDataBuilder($this->subjectReader);
+        $this->builder = new VaultCaptureDataBuilder($this->subjectReaderMock);
     }
 
     /**
@@ -59,45 +66,45 @@ public function testBuild()
         $amount = 30.00;
         $token = '5tfm4c';
         $buildSubject = [
-            'payment' => $this->paymentDO,
-            'amount' => $amount
+            'payment' => $this->paymentDOMock,
+            'amount' => $amount,
         ];
 
         $expected = [
             'amount' => $amount,
-            'paymentMethodToken' => $token
+            'paymentMethodToken' => $token,
         ];
 
-        $this->subjectReader->expects(self::once())
+        $this->subjectReaderMock->expects(self::once())
             ->method('readPayment')
             ->with($buildSubject)
-            ->willReturn($this->paymentDO);
-        $this->subjectReader->expects(self::once())
+            ->willReturn($this->paymentDOMock);
+        $this->subjectReaderMock->expects(self::once())
             ->method('readAmount')
             ->with($buildSubject)
             ->willReturn($amount);
 
-        $paymentExtension = $this->getMockBuilder(OrderPaymentExtension::class)
+        $paymentExtensionMock = $this->getMockBuilder(OrderPaymentExtension::class)
             ->setMethods(['getVaultPaymentToken'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
-        $paymentToken = $this->getMockBuilder(PaymentToken::class)
+        $paymentTokenMock = $this->getMockBuilder(PaymentToken::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $paymentExtension->expects(static::once())
+        $paymentExtensionMock->expects(static::once())
             ->method('getVaultPaymentToken')
-            ->willReturn($paymentToken);
-        $this->payment->expects(static::once())
+            ->willReturn($paymentTokenMock);
+        $this->paymentMock->expects(static::once())
             ->method('getExtensionAttributes')
-            ->willReturn($paymentExtension);
+            ->willReturn($paymentExtensionMock);
 
-        $paymentToken->expects(static::once())
+        $paymentTokenMock->expects(static::once())
             ->method('getGatewayToken')
             ->willReturn($token);
 
         $result = $this->builder->build($buildSubject);
-        static::assertEquals($expected, $result);
+        self::assertEquals($expected, $result);
     }
 }
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VoidDataBuilderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VoidDataBuilderTest.php
new file mode 100644
index 00000000000..88713885b5c
--- /dev/null
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Request/VoidDataBuilderTest.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Test\Unit\Gateway\Request;
+
+use Magento\Braintree\Gateway\SubjectReader;
+use Magento\Braintree\Gateway\Request\VoidDataBuilder;
+use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
+use Magento\Sales\Model\Order\Payment;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Tests \Magento\Braintree\Gateway\Request\VaultCaptureDataBuilder.
+ */
+class VoidDataBuilderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var VoidDataBuilder
+     */
+    private $builder;
+
+    /**
+     * @var PaymentDataObjectInterface|MockObject
+     */
+    private $paymentDOMock;
+
+    /**
+     * @var Payment|MockObject
+     */
+    private $paymentMock;
+
+    /**
+     * @var SubjectReader|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $subjectReaderMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->paymentDOMock = $this->createMock(PaymentDataObjectInterface::class);
+        $this->paymentMock = $this->getMockBuilder(Payment::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->paymentDOMock->expects(static::once())
+            ->method('getPayment')
+            ->willReturn($this->paymentMock);
+
+        $this->subjectReaderMock = $this->getMockBuilder(SubjectReader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->builder = new VoidDataBuilder($this->subjectReaderMock);
+    }
+
+    /**
+     * @param string|null $parentTransactionId
+     * @param string $callLastTransId
+     * @param string $lastTransId
+     * @param string $expected
+     * @return void
+     * @dataProvider buildDataProvider
+     */
+    public function testBuild($parentTransactionId, $callLastTransId, $lastTransId, $expected)
+    {
+        $amount = 30.00;
+
+        $buildSubject = [
+            'payment' => $this->paymentDOMock,
+            'amount' => $amount,
+        ];
+
+        $this->subjectReaderMock->expects(self::once())
+            ->method('readPayment')
+            ->with($buildSubject)
+            ->willReturn($this->paymentDOMock);
+
+        $this->paymentMock->expects(self::once())
+            ->method('getParentTransactionId')
+            ->willReturn($parentTransactionId);
+        $this->paymentMock->expects(self::$callLastTransId())
+            ->method('getLastTransId')
+            ->willReturn($lastTransId);
+
+        $result = $this->builder->build($buildSubject);
+        self::assertEquals(
+            ['transaction_id' => $expected],
+            $result
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function buildDataProvider()
+    {
+        return [
+            [
+                'parentTransactionId' => 'b3b99d',
+                'callLastTransId' => 'never',
+                'lastTransId' => 'd45d22',
+                'expected' => 'b3b99d',
+            ],
+            [
+                'parentTransactionId' => null,
+                'callLastTransId' => 'once',
+                'expected' => 'd45d22',
+                'lastTransId' => 'd45d22',
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/CardDetailsHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/CardDetailsHandlerTest.php
index 87e8e4e413c..a70993e14e5 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/CardDetailsHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/CardDetailsHandlerTest.php
@@ -5,16 +5,15 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Response;
 
-use Braintree\Result\Successful;
 use Braintree\Transaction;
 use Magento\Braintree\Gateway\Response\CardDetailsHandler;
 use Magento\Payment\Gateway\Data\PaymentDataObject;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Braintree\Gateway\Config\Config;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 
 /**
- * Class CardDetailsHandlerTest
+ * Tests \Magento\Braintree\Gateway\Response\CardDetailsHandler.
  */
 class CardDetailsHandlerTest extends \PHPUnit\Framework\TestCase
 {
@@ -26,12 +25,12 @@ class CardDetailsHandlerTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Sales\Model\Order\Payment|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $payment;
+    private $paymentMock;
 
     /**
      * @var \Magento\Braintree\Gateway\Config\Config|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $config;
+    private $configMock;
 
     /**
      * @var SubjectReader|\PHPUnit_Framework_MockObject_MockObject
@@ -45,7 +44,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->cardHandler = new CardDetailsHandler($this->config, $this->subjectReaderMock);
+        $this->cardHandler = new CardDetailsHandler($this->configMock, $this->subjectReaderMock);
     }
 
     /**
@@ -53,30 +52,30 @@ protected function setUp()
      */
     public function testHandle()
     {
-        $paymentData = $this->getPaymentDataObjectMock();
+        $paymentDataMock = $this->getPaymentDataObjectMock();
         $transaction = $this->getBraintreeTransaction();
 
-        $subject = ['payment' => $paymentData];
+        $subject = ['payment' => $paymentDataMock];
         $response = ['object' => $transaction];
 
         $this->subjectReaderMock->expects(self::once())
             ->method('readPayment')
             ->with($subject)
-            ->willReturn($paymentData);
+            ->willReturn($paymentDataMock);
         $this->subjectReaderMock->expects(self::once())
             ->method('readTransaction')
             ->with($response)
             ->willReturn($transaction);
 
-        $this->payment->expects(static::once())
+        $this->paymentMock->expects(static::once())
             ->method('setCcLast4');
-        $this->payment->expects(static::once())
+        $this->paymentMock->expects(static::once())
             ->method('setCcExpMonth');
-        $this->payment->expects(static::once())
+        $this->paymentMock->expects(static::once())
             ->method('setCcExpYear');
-        $this->payment->expects(static::once())
+        $this->paymentMock->expects(static::once())
             ->method('setCcType');
-        $this->payment->expects(static::exactly(2))
+        $this->paymentMock->expects(static::exactly(2))
             ->method('setAdditionalInformation');
 
         $this->cardHandler->handle($subject, $response);
@@ -87,12 +86,12 @@ public function testHandle()
      */
     private function initConfigMock()
     {
-        $this->config = $this->getMockBuilder(Config::class)
+        $this->configMock = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->setMethods(['getCctypesMapper'])
             ->getMock();
 
-        $this->config->expects(static::once())
+        $this->configMock->expects(static::once())
             ->method('getCctypesMapper')
             ->willReturn([
                 'american-express' => 'AE',
@@ -110,7 +109,7 @@ private function initConfigMock()
      */
     private function getPaymentDataObjectMock()
     {
-        $this->payment = $this->getMockBuilder(Payment::class)
+        $this->paymentMock = $this->getMockBuilder(Payment::class)
             ->disableOriginalConstructor()
             ->setMethods([
                 'setCcLast4',
@@ -128,7 +127,7 @@ private function getPaymentDataObjectMock()
 
         $mock->expects(static::once())
             ->method('getPayment')
-            ->willReturn($this->payment);
+            ->willReturn($this->paymentMock);
 
         return $mock;
     }
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPal/VaultDetailsHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPal/VaultDetailsHandlerTest.php
index 7630b03a1c3..ebadc1703ec 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPal/VaultDetailsHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPal/VaultDetailsHandlerTest.php
@@ -8,7 +8,7 @@
 use Braintree\Result\Successful;
 use Braintree\Transaction;
 use Braintree\Transaction\PayPalDetails;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Response\PayPal\VaultDetailsHandler;
 use Magento\Framework\Intl\DateTimeFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -23,7 +23,8 @@
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
- * Class VaultDetailsHandlerTest
+ * Tests \Magento\Braintree\Gateway\Response\PayPal\VaultDetailsHandler.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class VaultDetailsHandlerTest extends TestCase
@@ -37,32 +38,32 @@ class VaultDetailsHandlerTest extends TestCase
     /**
      * @var PaymentDataObjectInterface|MockObject
      */
-    private $paymentDataObject;
+    private $paymentDataObjectMock;
 
     /**
      * @var Payment|MockObject
      */
-    private $paymentInfo;
+    private $paymentInfoMock;
 
     /**
      * @var PaymentTokenFactoryInterface|MockObject
      */
-    private $paymentTokenFactory;
+    private $paymentTokenFactoryMock;
 
     /**
      * @var PaymentTokenInterface|MockObject
      */
-    protected $paymentToken;
+    protected $paymentTokenMock;
 
     /**
      * @var OrderPaymentExtension|MockObject
      */
-    private $paymentExtension;
+    private $paymentExtensionMock;
 
     /**
      * @var OrderPaymentExtensionInterfaceFactory|MockObject
      */
-    private $paymentExtensionFactory;
+    private $paymentExtensionFactoryMock;
 
     /**
      * @var VaultDetailsHandler
@@ -72,7 +73,7 @@ class VaultDetailsHandlerTest extends TestCase
     /**
      * @var DateTimeFactory|MockObject
      */
-    private $dateTimeFactory;
+    private $dateTimeFactoryMock;
 
     /**
      * @var array
@@ -83,43 +84,43 @@ protected function setUp()
     {
         $objectManager = new ObjectManager($this);
 
-        $this->paymentDataObject = $this->getMockForAbstractClass(PaymentDataObjectInterface::class);
+        $this->paymentDataObjectMock = $this->getMockForAbstractClass(PaymentDataObjectInterface::class);
 
-        $this->paymentInfo = $this->getMockBuilder(Payment::class)
+        $this->paymentInfoMock = $this->getMockBuilder(Payment::class)
             ->disableOriginalConstructor()
             ->setMethods(['__wakeup'])
             ->getMock();
 
-        $this->paymentToken = $objectManager->getObject(PaymentToken::class);
+        $this->paymentTokenMock = $objectManager->getObject(PaymentToken::class);
 
-        $this->paymentTokenFactory = $this->getMockBuilder(PaymentTokenFactoryInterface::class)
+        $this->paymentTokenFactoryMock = $this->getMockBuilder(PaymentTokenFactoryInterface::class)
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->paymentExtension = $this->getMockBuilder(OrderPaymentExtensionInterface::class)
+        $this->paymentExtensionMock = $this->getMockBuilder(OrderPaymentExtensionInterface::class)
             ->setMethods(['setVaultPaymentToken', 'getVaultPaymentToken'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->paymentExtensionFactory = $this->getMockBuilder(OrderPaymentExtensionInterfaceFactory::class)
+        $this->paymentExtensionFactoryMock = $this->getMockBuilder(OrderPaymentExtensionInterfaceFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
 
         $this->subject = [
-            'payment' => $this->paymentDataObject,
+            'payment' => $this->paymentDataObjectMock,
         ];
 
-        $this->dateTimeFactory = $this->getMockBuilder(DateTimeFactory::class)
+        $this->dateTimeFactoryMock = $this->getMockBuilder(DateTimeFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
         
         $this->handler = new VaultDetailsHandler(
-            $this->paymentTokenFactory,
-            $this->paymentExtensionFactory,
+            $this->paymentTokenFactoryMock,
+            $this->paymentExtensionFactoryMock,
             new SubjectReader(),
-            $this->dateTimeFactory
+            $this->dateTimeFactoryMock
         );
     }
 
@@ -130,35 +131,35 @@ public function testHandle()
             'object' => $transaction
         ];
 
-        $this->paymentExtension->method('setVaultPaymentToken')
-            ->with($this->paymentToken);
-        $this->paymentExtension->method('getVaultPaymentToken')
-            ->willReturn($this->paymentToken);
+        $this->paymentExtensionMock->method('setVaultPaymentToken')
+            ->with($this->paymentTokenMock);
+        $this->paymentExtensionMock->method('getVaultPaymentToken')
+            ->willReturn($this->paymentTokenMock);
         
-        $this->paymentDataObject->method('getPayment')
-            ->willReturn($this->paymentInfo);
+        $this->paymentDataObjectMock->method('getPayment')
+            ->willReturn($this->paymentInfoMock);
 
-        $this->paymentTokenFactory->method('create')
+        $this->paymentTokenFactoryMock->method('create')
             ->with(PaymentTokenFactoryInterface::TOKEN_TYPE_ACCOUNT)
-            ->willReturn($this->paymentToken);
+            ->willReturn($this->paymentTokenMock);
 
-        $this->paymentExtensionFactory->method('create')
-            ->willReturn($this->paymentExtension);
+        $this->paymentExtensionFactoryMock->method('create')
+            ->willReturn($this->paymentExtensionMock);
 
         $dateTime = new \DateTime('2016-07-05 00:00:00', new \DateTimeZone('UTC'));
         $expirationDate = '2017-07-05 00:00:00';
-        $this->dateTimeFactory->method('create')
+        $this->dateTimeFactoryMock->method('create')
             ->willReturn($dateTime);
         
         $this->handler->handle($this->subject, $response);
 
-        $extensionAttributes = $this->paymentInfo->getExtensionAttributes();
+        $extensionAttributes = $this->paymentInfoMock->getExtensionAttributes();
         $paymentToken = $extensionAttributes->getVaultPaymentToken();
         self::assertNotNull($paymentToken);
 
         $tokenDetails = json_decode($paymentToken->getTokenDetails(), true);
 
-        self::assertSame($this->paymentToken, $paymentToken);
+        self::assertSame($this->paymentTokenMock, $paymentToken);
         self::assertEquals(self::$token, $paymentToken->getGatewayToken());
         self::assertEquals(self::$payerEmail, $tokenDetails['payerEmail']);
         self::assertEquals($expirationDate, $paymentToken->getExpiresAt());
@@ -173,17 +174,17 @@ public function testHandleWithoutToken()
             'object' => $transaction
         ];
 
-        $this->paymentDataObject->method('getPayment')
-            ->willReturn($this->paymentInfo);
+        $this->paymentDataObjectMock->method('getPayment')
+            ->willReturn($this->paymentInfoMock);
 
-        $this->paymentTokenFactory->expects(self::never())
+        $this->paymentTokenFactoryMock->expects(self::never())
             ->method('create');
 
-        $this->dateTimeFactory->expects(self::never())
+        $this->dateTimeFactoryMock->expects(self::never())
             ->method('create');
 
         $this->handler->handle($this->subject, $response);
-        self::assertNull($this->paymentInfo->getExtensionAttributes());
+        self::assertNull($this->paymentInfoMock->getExtensionAttributes());
     }
 
     /**
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPalDetailsHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPalDetailsHandlerTest.php
index f1420ee895e..1b2c8c6bb4a 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPalDetailsHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PayPalDetailsHandlerTest.php
@@ -8,9 +8,8 @@
 use Braintree\Transaction;
 use Magento\Braintree\Gateway\Response\PayPalDetailsHandler;
 use Magento\Payment\Gateway\Data\PaymentDataObject;
-use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Payment;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
@@ -26,26 +25,26 @@ class PayPalDetailsHandlerTest extends \PHPUnit\Framework\TestCase
     /**
      * @var Payment|MockObject
      */
-    private $payment;
+    private $paymentMock;
 
     /**
      * @var SubjectReader|MockObject
      */
-    private $subjectReader;
+    private $subjectReaderMock;
 
     protected function setUp()
     {
-        $this->payment = $this->getMockBuilder(Payment::class)
+        $this->paymentMock = $this->getMockBuilder(Payment::class)
             ->disableOriginalConstructor()
             ->setMethods([
                 'setAdditionalInformation',
             ])
             ->getMock();
-        $this->subjectReader = $this->getMockBuilder(SubjectReader::class)
+        $this->subjectReaderMock = $this->getMockBuilder(SubjectReader::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->payPalHandler = new PayPalDetailsHandler($this->subjectReader);
+        $this->payPalHandler = new PayPalDetailsHandler($this->subjectReaderMock);
     }
 
     /**
@@ -53,26 +52,26 @@ protected function setUp()
      */
     public function testHandle()
     {
-        $paymentData = $this->getPaymentDataObjectMock();
+        $paymentDataMock = $this->getPaymentDataObjectMock();
         $transaction = $this->getBraintreeTransaction();
 
-        $subject = ['payment' => $paymentData];
+        $subject = ['payment' => $paymentDataMock];
         $response = ['object' => $transaction];
 
-        $this->subjectReader->expects(self::once())
+        $this->subjectReaderMock->expects(self::once())
             ->method('readPayment')
             ->with($subject)
-            ->willReturn($paymentData);
-        $this->subjectReader->expects(self::once())
+            ->willReturn($paymentDataMock);
+        $this->subjectReaderMock->expects(self::once())
             ->method('readTransaction')
             ->with($response)
             ->willReturn($transaction);
-        $this->subjectReader->expects(static::once())
+        $this->subjectReaderMock->expects(static::once())
             ->method('readPayPal')
             ->with($transaction)
             ->willReturn($transaction->paypal);
 
-        $this->payment->expects(static::exactly(2))
+        $this->paymentMock->expects(static::exactly(2))
             ->method('setAdditionalInformation');
 
         $this->payPalHandler->handle($subject, $response);
@@ -91,7 +90,7 @@ private function getPaymentDataObjectMock()
 
         $mock->expects(static::once())
             ->method('getPayment')
-            ->willReturn($this->payment);
+            ->willReturn($this->paymentMock);
 
         return $mock;
     }
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PaymentDetailsHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PaymentDetailsHandlerTest.php
index d90caa84b44..69beab38f00 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PaymentDetailsHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/PaymentDetailsHandlerTest.php
@@ -8,13 +8,12 @@
 use Braintree\Transaction;
 use Magento\Braintree\Gateway\Response\PaymentDetailsHandler;
 use Magento\Payment\Gateway\Data\PaymentDataObject;
-use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Payment;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
- * Class PaymentDetailsHandlerTest
+ * Tests \\Magento\Braintree\Gateway\Response\PaymentDetailsHandler.
  */
 class PaymentDetailsHandlerTest extends \PHPUnit\Framework\TestCase
 {
@@ -28,35 +27,35 @@ class PaymentDetailsHandlerTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Sales\Model\Order\Payment|MockObject
      */
-    private $payment;
+    private $paymentMock;
 
     /**
      * @var SubjectReader|MockObject
      */
-    private $subjectReader;
+    private $subjectReaderMock;
 
     protected function setUp()
     {
-        $this->payment = $this->getMockBuilder(Payment::class)
+        $this->paymentMock = $this->getMockBuilder(Payment::class)
             ->disableOriginalConstructor()
             ->setMethods([
                 'setCcTransId',
                 'setLastTransId',
-                'setAdditionalInformation'
+                'setAdditionalInformation',
             ])
             ->getMock();
-        $this->subjectReader = $this->getMockBuilder(SubjectReader::class)
+        $this->subjectReaderMock = $this->getMockBuilder(SubjectReader::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->payment->expects(static::once())
+        $this->paymentMock->expects(static::once())
             ->method('setCcTransId');
-        $this->payment->expects(static::once())
+        $this->paymentMock->expects(static::once())
             ->method('setLastTransId');
-        $this->payment->expects(static::any())
+        $this->paymentMock->expects(static::any())
             ->method('setAdditionalInformation');
 
-        $this->paymentHandler = new PaymentDetailsHandler($this->subjectReader);
+        $this->paymentHandler = new PaymentDetailsHandler($this->subjectReaderMock);
     }
 
     /**
@@ -64,17 +63,17 @@ protected function setUp()
      */
     public function testHandle()
     {
-        $paymentData = $this->getPaymentDataObjectMock();
+        $paymentDataMock = $this->getPaymentDataObjectMock();
         $transaction = $this->getBraintreeTransaction();
 
-        $subject = ['payment' => $paymentData];
+        $subject = ['payment' => $paymentDataMock];
         $response = ['object' => $transaction];
 
-        $this->subjectReader->expects(self::once())
+        $this->subjectReaderMock->expects(self::once())
             ->method('readPayment')
             ->with($subject)
-            ->willReturn($paymentData);
-        $this->subjectReader->expects(self::once())
+            ->willReturn($paymentDataMock);
+        $this->subjectReaderMock->expects(self::once())
             ->method('readTransaction')
             ->with($response)
             ->willReturn($transaction);
@@ -95,7 +94,7 @@ private function getPaymentDataObjectMock()
 
         $mock->expects(static::once())
             ->method('getPayment')
-            ->willReturn($this->payment);
+            ->willReturn($this->paymentMock);
 
         return $mock;
     }
@@ -113,7 +112,7 @@ private function getBraintreeTransaction()
             'cvvResponseCode' => 'M',
             'processorAuthorizationCode' => 'W1V8XK',
             'processorResponseCode' => '1000',
-            'processorResponseText' => 'Approved'
+            'processorResponseText' => 'Approved',
         ];
 
         return Transaction::factory($attributes);
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/RiskDataHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/RiskDataHandlerTest.php
index 2365c396c2f..b86952ebf07 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/RiskDataHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/RiskDataHandlerTest.php
@@ -6,7 +6,7 @@
 namespace Magento\Braintree\Test\Unit\Gateway\Response;
 
 use Braintree\Transaction;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Response\RiskDataHandler;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Sales\Model\Order\Payment;
@@ -27,19 +27,19 @@ class RiskDataHandlerTest extends \PHPUnit\Framework\TestCase
     /**
      * @var SubjectReader|MockObject
      */
-    private $subjectReader;
+    private $subjectReaderMock;
 
     /**
-     * Set up
+     * @inheritdoc
      */
     protected function setUp()
     {
-        $this->subjectReader = $this->getMockBuilder(SubjectReader::class)
+        $this->subjectReaderMock = $this->getMockBuilder(SubjectReader::class)
             ->disableOriginalConstructor()
             ->setMethods(['readPayment', 'readTransaction'])
             ->getMock();
 
-        $this->riskDataHandler = new RiskDataHandler($this->subjectReader);
+        $this->riskDataHandler = new RiskDataHandler($this->subjectReaderMock);
     }
 
     /**
@@ -76,11 +76,11 @@ public function testHandle($riskDecision, $isFraud)
             'payment' => $paymentDO,
         ];
 
-        $this->subjectReader->expects(static::once())
+        $this->subjectReaderMock->expects(static::once())
             ->method('readPayment')
             ->with($handlingSubject)
             ->willReturn($paymentDO);
-        $this->subjectReader->expects(static::once())
+        $this->subjectReaderMock->expects(static::once())
             ->method('readTransaction')
             ->with($response)
             ->willReturn($transaction);
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/ThreeDSecureDetailsHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/ThreeDSecureDetailsHandlerTest.php
index 9ca9ca6aa07..e97eefc8a34 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/ThreeDSecureDetailsHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/ThreeDSecureDetailsHandlerTest.php
@@ -8,9 +8,8 @@
 use Braintree\Transaction;
 use Magento\Braintree\Gateway\Response\ThreeDSecureDetailsHandler;
 use Magento\Payment\Gateway\Data\PaymentDataObject;
-use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Payment;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
@@ -29,7 +28,7 @@ class ThreeDSecureDetailsHandlerTest extends \PHPUnit\Framework\TestCase
     /**
      * @var \Magento\Sales\Model\Order\Payment|MockObject
      */
-    private $payment;
+    private $paymentMock;
 
     /**
      * @var SubjectReader|\PHPUnit_Framework_MockObject_MockObject
@@ -38,7 +37,7 @@ class ThreeDSecureDetailsHandlerTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp()
     {
-        $this->payment = $this->getMockBuilder(Payment::class)
+        $this->paymentMock = $this->getMockBuilder(Payment::class)
             ->disableOriginalConstructor()
             ->setMethods([
                 'unsAdditionalInformation',
@@ -74,10 +73,10 @@ public function testHandle()
             ->with($response)
             ->willReturn($transaction);
 
-        $this->payment->expects(static::at(1))
+        $this->paymentMock->expects(static::at(1))
             ->method('setAdditionalInformation')
             ->with('liabilityShifted', 'Yes');
-        $this->payment->expects(static::at(2))
+        $this->paymentMock->expects(static::at(2))
             ->method('setAdditionalInformation')
             ->with('liabilityShiftPossible', 'Yes');
 
@@ -97,7 +96,7 @@ private function getPaymentDataObjectMock()
 
         $mock->expects(static::once())
             ->method('getPayment')
-            ->willReturn($this->payment);
+            ->willReturn($this->paymentMock);
 
         return $mock;
     }
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/TransactionIdHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/TransactionIdHandlerTest.php
index 3a2d2f70735..6cbca707242 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/TransactionIdHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/TransactionIdHandlerTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Response;
 
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Response\TransactionIdHandler;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Sales\Model\Order\Payment;
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php
index 0131b1dda95..74592c6869e 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VaultDetailsHandlerTest.php
@@ -9,7 +9,7 @@
 use Braintree\Transaction;
 use Braintree\Transaction\CreditCardDetails;
 use Magento\Braintree\Gateway\Config\Config;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Response\PaymentDetailsHandler;
 use Magento\Braintree\Gateway\Response\VaultDetailsHandler;
 use Magento\Framework\Serialize\Serializer\Json;
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VoidHandlerTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VoidHandlerTest.php
index 398349a9692..a541b0115fe 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VoidHandlerTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Response/VoidHandlerTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Braintree\Test\Unit\Gateway\Response;
 
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Response\VoidHandler;
 use Magento\Payment\Gateway\Data\PaymentDataObjectInterface;
 use Magento\Sales\Model\Order\Payment;
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Helper/SubjectReaderTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/SubjectReaderTest.php
similarity index 73%
rename from app/code/Magento/Braintree/Test/Unit/Gateway/Helper/SubjectReaderTest.php
rename to app/code/Magento/Braintree/Test/Unit/Gateway/SubjectReaderTest.php
index b2207563b8b..4213acc8b4f 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Helper/SubjectReaderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/SubjectReaderTest.php
@@ -3,11 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Braintree\Test\Unit\Gateway\Helper;
+namespace Magento\Braintree\Test\Unit\Gateway;
 
 use Braintree\Transaction;
-use InvalidArgumentException;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 
 /**
  * Class SubjectReaderTest
@@ -25,8 +24,8 @@ protected function setUp()
     }
 
     /**
-     * @covers \Magento\Braintree\Gateway\Helper\SubjectReader::readCustomerId
-     * @expectedException InvalidArgumentException
+     * @covers \Magento\Braintree\Gateway\SubjectReader::readCustomerId
+     * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage The "customerId" field does not exists
      */
     public function testReadCustomerIdWithException()
@@ -35,7 +34,7 @@ public function testReadCustomerIdWithException()
     }
 
     /**
-     * @covers \Magento\Braintree\Gateway\Helper\SubjectReader::readCustomerId
+     * @covers \Magento\Braintree\Gateway\SubjectReader::readCustomerId
      */
     public function testReadCustomerId()
     {
@@ -44,8 +43,8 @@ public function testReadCustomerId()
     }
 
     /**
-     * @covers \Magento\Braintree\Gateway\Helper\SubjectReader::readPublicHash
-     * @expectedException InvalidArgumentException
+     * @covers \Magento\Braintree\Gateway\SubjectReader::readPublicHash
+     * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage The "public_hash" field does not exists
      */
     public function testReadPublicHashWithException()
@@ -54,7 +53,7 @@ public function testReadPublicHashWithException()
     }
 
     /**
-     * @covers \Magento\Braintree\Gateway\Helper\SubjectReader::readPublicHash
+     * @covers \Magento\Braintree\Gateway\SubjectReader::readPublicHash
      */
     public function testReadPublicHash()
     {
@@ -63,7 +62,7 @@ public function testReadPublicHash()
     }
 
     /**
-     * @covers \Magento\Braintree\Gateway\Helper\SubjectReader::readPayPal
+     * @covers \Magento\Braintree\Gateway\SubjectReader::readPayPal
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Transaction has't paypal attribute
      */
@@ -76,7 +75,7 @@ public function testReadPayPalWithException()
     }
 
     /**
-     * @covers \Magento\Braintree\Gateway\Helper\SubjectReader::readPayPal
+     * @covers \Magento\Braintree\Gateway\SubjectReader::readPayPal
      */
     public function testReadPayPal()
     {
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php
index 1a9e547e906..c8a46da504f 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/GeneralResponseValidatorTest.php
@@ -10,7 +10,7 @@
 use Magento\Payment\Gateway\Validator\ResultInterface;
 use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
 use Magento\Braintree\Gateway\Validator\GeneralResponseValidator;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 
 class GeneralResponseValidatorTest extends \PHPUnit\Framework\TestCase
 {
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/PaymentNonceResponseValidatorTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/PaymentNonceResponseValidatorTest.php
index 294226b1656..03363b5463d 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/PaymentNonceResponseValidatorTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/PaymentNonceResponseValidatorTest.php
@@ -9,7 +9,7 @@
 use Magento\Braintree\Gateway\Validator\PaymentNonceResponseValidator;
 use Magento\Payment\Gateway\Validator\ResultInterface;
 use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 
 /**
  * Class PaymentNonceResponseValidatorTest
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/ResponseValidatorTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/ResponseValidatorTest.php
index aeb9b4a8307..4bd446079f9 100644
--- a/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/ResponseValidatorTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Gateway/Validator/ResponseValidatorTest.php
@@ -10,7 +10,7 @@
 use Magento\Payment\Gateway\Validator\ResultInterface;
 use Magento\Payment\Gateway\Validator\ResultInterfaceFactory;
 use Magento\Braintree\Gateway\Validator\ResponseValidator;
-use Magento\Braintree\Gateway\Helper\SubjectReader;
+use Magento\Braintree\Gateway\SubjectReader;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Braintree\Result\Error;
 use Braintree\Result\Successful;
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionsCollectionTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionsCollectionTest.php
index d9a33bfea02..f33af81b197 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionsCollectionTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Report/TransactionsCollectionTest.php
@@ -6,10 +6,12 @@
 namespace Magento\Braintree\Test\Unit\Model\Report;
 
 use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
 use Magento\Braintree\Model\Report\FilterMapper;
 use Magento\Braintree\Model\Report\TransactionsCollection;
 use Magento\Framework\Api\Search\DocumentInterface;
 use Magento\Framework\Data\Collection\EntityFactoryInterface;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * Class TransactionsCollectionTest
@@ -19,22 +21,27 @@
 class TransactionsCollectionTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var BraintreeAdapter|\PHPUnit_Framework_MockObject_MockObject
+     * @var BraintreeAdapter|MockObject
      */
     private $braintreeAdapterMock;
 
     /**
-     * @var EntityFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var BraintreeAdapterFactory|MockObject
+     */
+    private $adapterFactoryMock;
+
+    /**
+     * @var EntityFactoryInterface|MockObject
      */
     private $entityFactoryMock;
 
     /**
-     * @var FilterMapper|\PHPUnit_Framework_MockObject_MockObject
+     * @var FilterMapper|MockObject
      */
     private $filterMapperMock;
 
     /**
-     * @var DocumentInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var DocumentInterface|MockObject
      */
     private $transactionMapMock;
 
@@ -61,6 +68,11 @@ protected function setUp()
             ->setMethods(['search'])
             ->disableOriginalConstructor()
             ->getMock();
+        $this->adapterFactoryMock = $this->getMockBuilder(BraintreeAdapterFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->adapterFactoryMock->method('create')
+            ->willReturn($this->braintreeAdapterMock);
     }
 
     /**
@@ -82,7 +94,7 @@ public function testGetItems()
 
         $collection = new TransactionsCollection(
             $this->entityFactoryMock,
-            $this->braintreeAdapterMock,
+            $this->adapterFactoryMock,
             $this->filterMapperMock
         );
 
@@ -111,7 +123,7 @@ public function testGetItemsEmptyCollection()
 
         $collection = new TransactionsCollection(
             $this->entityFactoryMock,
-            $this->braintreeAdapterMock,
+            $this->adapterFactoryMock,
             $this->filterMapperMock
         );
 
@@ -141,7 +153,7 @@ public function testGetItemsWithLimit()
 
         $collection = new TransactionsCollection(
             $this->entityFactoryMock,
-            $this->braintreeAdapterMock,
+            $this->adapterFactoryMock,
             $this->filterMapperMock
         );
         $collection->setPageSize(TransactionsCollection::TRANSACTION_MAXIMUM_COUNT);
@@ -173,7 +185,7 @@ public function testGetItemsWithNullLimit()
 
         $collection = new TransactionsCollection(
             $this->entityFactoryMock,
-            $this->braintreeAdapterMock,
+            $this->adapterFactoryMock,
             $this->filterMapperMock
         );
         $collection->setPageSize(null);
@@ -198,7 +210,7 @@ public function testAddToFilter($field, $condition, $filterMapperCall, $expected
 
         $collection = new TransactionsCollection(
             $this->entityFactoryMock,
-            $this->braintreeAdapterMock,
+            $this->adapterFactoryMock,
             $this->filterMapperMock
         );
 
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php b/app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php
index 6c85ae68eb7..24bc4eae960 100644
--- a/app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php
+++ b/app/code/Magento/Braintree/Test/Unit/Model/Ui/ConfigProviderTest.php
@@ -7,7 +7,9 @@
 
 use Magento\Braintree\Gateway\Config\Config;
 use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
 use Magento\Braintree\Model\Ui\ConfigProvider;
+use Magento\Customer\Model\Session;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
@@ -31,6 +33,11 @@ class ConfigProviderTest extends \PHPUnit\Framework\TestCase
      */
     private $braintreeAdapter;
 
+    /**
+     * @var Session|MockObject
+     */
+    private $session;
+
     /**
      * @var ConfigProvider
      */
@@ -45,10 +52,24 @@ protected function setUp()
         $this->braintreeAdapter = $this->getMockBuilder(BraintreeAdapter::class)
             ->disableOriginalConstructor()
             ->getMock();
+        /** @var BraintreeAdapterFactory|MockObject $adapterFactoryMock */
+        $adapterFactoryMock = $this->getMockBuilder(BraintreeAdapterFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $adapterFactoryMock->method('create')
+            ->willReturn($this->braintreeAdapter);
+
+        $this->session = $this->getMockBuilder(Session::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getStoreId'])
+            ->getMock();
+        $this->session->method('getStoreId')
+            ->willReturn(null);
 
         $this->configProvider = new ConfigProvider(
             $this->config,
-            $this->braintreeAdapter
+            $adapterFactoryMock,
+            $this->session
         );
     }
 
diff --git a/app/code/Magento/Braintree/etc/adminhtml/di.xml b/app/code/Magento/Braintree/etc/adminhtml/di.xml
index d0469ded83b..b7231f54186 100644
--- a/app/code/Magento/Braintree/etc/adminhtml/di.xml
+++ b/app/code/Magento/Braintree/etc/adminhtml/di.xml
@@ -28,6 +28,7 @@
                 <item name="address" xsi:type="string">Magento\Braintree\Gateway\Request\AddressDataBuilder</item>
                 <item name="vault" xsi:type="string">Magento\Braintree\Gateway\Request\VaultDataBuilder</item>
                 <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
+                <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -39,6 +40,7 @@
                 <item name="channel" xsi:type="string">Magento\Braintree\Gateway\Request\ChannelDataBuilder</item>
                 <item name="address" xsi:type="string">Magento\Braintree\Gateway\Request\AddressDataBuilder</item>
                 <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
+                <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
             </argument>
         </arguments>
     </virtualType>
diff --git a/app/code/Magento/Braintree/etc/di.xml b/app/code/Magento/Braintree/etc/di.xml
index 2a451e132ea..1b839f469a1 100644
--- a/app/code/Magento/Braintree/etc/di.xml
+++ b/app/code/Magento/Braintree/etc/di.xml
@@ -214,6 +214,7 @@
                 <item name="3dsecure" xsi:type="string">Magento\Braintree\Gateway\Request\ThreeDSecureDataBuilder</item>
                 <item name="device_data" xsi:type="string">Magento\Braintree\Gateway\Request\KountPaymentDataBuilder</item>
                 <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
+                <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -245,6 +246,7 @@
         <arguments>
             <argument name="builders" xsi:type="array">
                 <item name="capture" xsi:type="string">Magento\Braintree\Gateway\Request\CaptureDataBuilder</item>
+                <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -268,6 +270,7 @@
                 <item name="3dsecure" xsi:type="string">Magento\Braintree\Gateway\Request\ThreeDSecureDataBuilder</item>
                 <item name="device_data" xsi:type="string">Magento\Braintree\Gateway\Request\KountPaymentDataBuilder</item>
                 <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
+                <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -300,6 +303,7 @@
             <argument name="builders" xsi:type="array">
                 <item name="vault_capture" xsi:type="string">Magento\Braintree\Gateway\Request\VaultCaptureDataBuilder</item>
                 <item name="settlement" xsi:type="string">Magento\Braintree\Gateway\Request\SettlementDataBuilder</item>
+                <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -321,6 +325,7 @@
                 <item name="vault" xsi:type="string">Magento\Braintree\Gateway\Request\PayPal\VaultDataBuilder</item>
                 <item name="device_data" xsi:type="string">Magento\Braintree\Gateway\Request\PayPal\DeviceDataBuilder</item>
                 <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
+                <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -353,6 +358,7 @@
                 <item name="channel" xsi:type="string">Magento\Braintree\Gateway\Request\ChannelDataBuilder</item>
                 <item name="address" xsi:type="string">Magento\Braintree\Gateway\Request\AddressDataBuilder</item>
                 <item name="dynamic_descriptor" xsi:type="string">Magento\Braintree\Gateway\Request\DescriptorDataBuilder</item>
+                <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
             </argument>
         </arguments>
     </virtualType>
@@ -375,7 +381,7 @@
     <!-- Value handlers infrastructure -->
     <type name="Magento\Braintree\Gateway\Response\VaultDetailsHandler">
         <arguments>
-            <argument name="paymentTokenFactory" xsi:type="object">Magento\Vault\Model\CreditCardTokenFactory</argument>
+            <argument name="paymentTokenFactory" xsi:type="object">Magento\Vault\Api\Data\PaymentTokenFactoryInterface</argument>
         </arguments>
     </type>
     <virtualType name="BraintreeValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
@@ -463,23 +469,41 @@
     <virtualType name="BraintreeVoidCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
         <arguments>
             <argument name="client" xsi:type="object">Magento\Braintree\Gateway\Http\Client\TransactionVoid</argument>
-            <argument name="requestBuilder" xsi:type="object">Magento\Braintree\Gateway\Request\VoidDataBuilder</argument>
+            <argument name="requestBuilder" xsi:type="object">BraintreeVoidRequestBuilder</argument>
             <argument name="handler" xsi:type="object">Magento\Braintree\Gateway\Response\VoidHandler</argument>
             <argument name="validator" xsi:type="object">Magento\Braintree\Gateway\Validator\GeneralResponseValidator</argument>
             <argument name="transferFactory" xsi:type="object">Magento\Braintree\Gateway\Http\TransferFactory</argument>
         </arguments>
     </virtualType>
+    <virtualType name="BraintreeVoidRequestBuilder" type="Magento\Payment\Gateway\Request\BuilderComposite">
+        <arguments>
+            <argument name="builders" xsi:type="array">
+                <item name="void" xsi:type="string">Magento\Braintree\Gateway\Request\VoidDataBuilder</item>
+                <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <!-- END Void Command -->
 
     <!-- Refund Command -->
     <virtualType name="BraintreeRefundCommand" type="Magento\Payment\Gateway\Command\GatewayCommand">
         <arguments>
             <argument name="client" xsi:type="object">Magento\Braintree\Gateway\Http\Client\TransactionRefund</argument>
-            <argument name="requestBuilder" xsi:type="object">Magento\Braintree\Gateway\Request\RefundDataBuilder</argument>
+            <argument name="requestBuilder" xsi:type="object">BraintreeRefundBuilder</argument>
             <argument name="validator" xsi:type="object">Magento\Braintree\Gateway\Validator\GeneralResponseValidator</argument>
             <argument name="handler" xsi:type="object">Magento\Braintree\Gateway\Response\RefundHandler</argument>
             <argument name="transferFactory" xsi:type="object">Magento\Braintree\Gateway\Http\TransferFactory</argument>
         </arguments>
     </virtualType>
+    <virtualType name="BraintreeRefundBuilder" type="Magento\Payment\Gateway\Request\BuilderComposite">
+        <arguments>
+            <argument name="builders" xsi:type="array">
+                <item name="refund" xsi:type="string">Magento\Braintree\Gateway\Request\RefundDataBuilder</item>
+                <item name="store" xsi:type="string">Magento\Braintree\Gateway\Request\StoreConfigBuilder</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <!-- END Refund Command -->
 
     <!-- Braintree validators infrastructure -->
     <virtualType name="BraintreeCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
@@ -494,7 +518,7 @@
             </argument>
         </arguments>
     </virtualType>
-    <!-- Braintree validators infrastructure -->
+    <!-- END Braintree validators infrastructure -->
 
     <!-- Braintree PayPal validators -->
     <virtualType name="BraintreePayPalCountryValidator" type="Magento\Payment\Gateway\Validator\CountryValidator">
diff --git a/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js b/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
index c8aaa65cebb..5e1e85e6a3c 100644
--- a/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
+++ b/app/code/Magento/Braintree/view/adminhtml/web/js/braintree.js
@@ -116,7 +116,7 @@ define([
         },
 
         /**
-         * Setup Braintree SDK
+         * Retrieves client token and setup Braintree SDK
          */
         initBraintree: function () {
             var self = this;
@@ -124,35 +124,14 @@ define([
             try {
                 $('body').trigger('processStart');
 
-                self.braintree.setup(self.clientToken, 'custom', {
-                    id: self.selector,
-                    hostedFields: self.getHostedFields(),
-
-                    /**
-                     * Triggered when sdk was loaded
-                     */
-                    onReady: function () {
-                        $('body').trigger('processStop');
-                    },
-
-                    /**
-                     * Callback for success response
-                     * @param {Object} response
-                     */
-                    onPaymentMethodReceived: function (response) {
-                        if (self.validateCardType()) {
-                            self.setPaymentDetails(response.nonce);
-                            self.placeOrder();
-                        }
-                    },
+                $.getJSON(self.clientTokenUrl).done(function (response) {
+                    self.clientToken = response.clientToken;
+                    self._initBraintree();
+                }).fail(function (response) {
+                    var failed = JSON.parse(response.responseText);
 
-                    /**
-                     * Error callback
-                     * @param {Object} response
-                     */
-                    onError: function (response) {
-                        self.error(response.message);
-                    }
+                    $('body').trigger('processStop');
+                    self.error(failed.message);
                 });
             } catch (e) {
                 $('body').trigger('processStop');
@@ -160,6 +139,44 @@ define([
             }
         },
 
+        /**
+         * Setup Braintree SDK
+         */
+        _initBraintree: function () {
+            var self = this;
+
+            self.braintree.setup(self.clientToken, 'custom', {
+                id: self.selector,
+                hostedFields: self.getHostedFields(),
+
+                /**
+                 * Triggered when sdk was loaded
+                 */
+                onReady: function () {
+                    $('body').trigger('processStop');
+                },
+
+                /**
+                 * Callback for success response
+                 * @param {Object} response
+                 */
+                onPaymentMethodReceived: function (response) {
+                    if (self.validateCardType()) {
+                        self.setPaymentDetails(response.nonce);
+                        self.placeOrder();
+                    }
+                },
+
+                /**
+                 * Error callback
+                 * @param {Object} response
+                 */
+                onError: function (response) {
+                    self.error(response.message);
+                }
+            });
+        },
+
         /**
          * Get hosted fields configuration
          * @returns {Object}
@@ -211,6 +228,7 @@ define([
             }
 
             if (event.type !== 'fieldStateChange') {
+
                 return false;
             }
 
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php
index df5894bf4cb..20bd1b379be 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php
@@ -14,6 +14,9 @@
 use Magento\Backend\Block\Widget\Grid;
 use Magento\Backend\Block\Widget\Grid\Column;
 use Magento\Backend\Block\Widget\Grid\Extended;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Framework\App\ObjectManager;
 
 class Product extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -29,22 +32,38 @@ class Product extends \Magento\Backend\Block\Widget\Grid\Extended
      */
     protected $_productFactory;
 
+    /**
+     * @var Status
+     */
+    private $status;
+
+    /**
+     * @var Visibility
+     */
+    private $visibility;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param \Magento\Framework\Registry $coreRegistry
      * @param array $data
+     * @param Visibility|null $visibility
+     * @param Status|null $status
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Backend\Helper\Data $backendHelper,
         \Magento\Catalog\Model\ProductFactory $productFactory,
         \Magento\Framework\Registry $coreRegistry,
-        array $data = []
+        array $data = [],
+        Visibility $visibility = null,
+        Status $status = null
     ) {
         $this->_productFactory = $productFactory;
         $this->_coreRegistry = $coreRegistry;
+        $this->visibility = $visibility ?: ObjectManager::getInstance()->get(Visibility::class);
+        $this->status = $status ?: ObjectManager::getInstance()->get(Status::class);
         parent::__construct($context, $backendHelper, $data);
     }
 
@@ -102,6 +121,10 @@ protected function _prepareCollection()
             'name'
         )->addAttributeToSelect(
             'sku'
+        )->addAttributeToSelect(
+            'visibility'
+        )->addAttributeToSelect(
+            'status'
         )->addAttributeToSelect(
             'price'
         )->joinField(
@@ -159,6 +182,28 @@ protected function _prepareColumns()
         );
         $this->addColumn('name', ['header' => __('Name'), 'index' => 'name']);
         $this->addColumn('sku', ['header' => __('SKU'), 'index' => 'sku']);
+        $this->addColumn(
+            'visibility',
+            [
+                'header' => __('Visibility'),
+                'index' => 'visibility',
+                'type' => 'options',
+                'options' => $this->visibility->getOptionArray(),
+                'header_css_class' => 'col-visibility',
+                'column_css_class' => 'col-visibility'
+            ]
+        );
+
+        $this->addColumn(
+            'status',
+            [
+                'header' => __('Status'),
+                'index' => 'status',
+                'type' => 'options',
+                'options' => $this->status->getOptionArray()
+            ]
+        );
+
         $this->addColumn(
             'price',
             [
diff --git a/app/code/Magento/Catalog/Block/Product/ImageBuilder.php b/app/code/Magento/Catalog/Block/Product/ImageBuilder.php
index b752000f5a1..f1149f15c41 100644
--- a/app/code/Magento/Catalog/Block/Product/ImageBuilder.php
+++ b/app/code/Magento/Catalog/Block/Product/ImageBuilder.php
@@ -146,6 +146,7 @@ public function create()
                 'custom_attributes' => $this->getCustomAttributes(),
                 'resized_image_width' => $imagesize[0],
                 'resized_image_height' => $imagesize[1],
+                'product_id' => $this->product->getId()
             ],
         ];
 
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
index 54a4ff8239d..cde186a7e44 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php
@@ -115,47 +115,6 @@ public function execute()
         return $this;
     }
 
-    /**
-     * Return select for remove unnecessary data
-     *
-     * @return \Magento\Framework\DB\Select
-     *
-     * @deprecated Not used anymore.
-     * @see clearCurrentTable()
-     */
-    protected function getSelectUnnecessaryData()
-    {
-        return $this->connection->select()->from(
-            $this->getMainTable(),
-            []
-        )->joinLeft(
-            ['t' => $this->getMainTable()],
-            $this->getMainTable() .
-            '.category_id = t.category_id AND ' .
-            $this->getMainTable() .
-            '.store_id = t.store_id AND ' .
-            $this->getMainTable() .
-            '.product_id = t.product_id',
-            []
-        )->where(
-            't.category_id IS NULL'
-        );
-    }
-
-    /**
-     * Remove unnecessary data
-     *
-     * @return void
-     *
-     * @deprecated Not used anymore.
-     * @see clearCurrentTable()
-     */
-    protected function removeUnnecessaryData()
-    {
-        //Called for backward compatibility.
-        $this->getSelectUnnecessaryData();
-    }
-
     /**
      * Publish data from tmp to index
      *
@@ -254,8 +213,6 @@ private function reindexCategoriesBySelect(\Magento\Framework\DB\Select $basicSe
                 )
             );
             $this->publishData();
-            //Called for backward compatibility.
-            $this->removeUnnecessaryData();
         }
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Option.php b/app/code/Magento/Catalog/Model/Product/Option.php
index 67d9074d913..39595cdaa60 100644
--- a/app/code/Magento/Catalog/Model/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/Product/Option.php
@@ -377,6 +377,10 @@ public function beforeSave()
                 }
             }
         }
+        if ($this->getGroupByType($this->getData('type')) === self::OPTION_GROUP_FILE) {
+            $this->cleanFileExtensions();
+        }
+
         return $this;
     }
 
@@ -902,4 +906,20 @@ private function getMetadataPool()
     }
 
     //@codeCoverageIgnoreEnd
+
+    /**
+     * Clears all non-accepted characters from file_extension field.
+     *
+     * @return void
+     */
+    private function cleanFileExtensions()
+    {
+        $rawExtensions = $this->getFileExtension();
+        $matches = [];
+        preg_match_all('/(?<extensions>[a-z0-9]+)/i', strtolower($rawExtensions), $matches);
+        if (!empty($matches)) {
+            $extensions = implode(', ', array_unique($matches['extensions']));
+        }
+        $this->setFileExtension($extensions);
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
index 08e1a3e327d..0ace0372c43 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
@@ -71,7 +71,8 @@ public function validateUserValue($values)
         }
         if (!$this->_isSingleSelection()) {
             $valuesCollection = $option->getOptionValuesByOptionId($value, $this->getProduct()->getStoreId())->load();
-            if ($valuesCollection->count() != count($value)) {
+            $valueCount = is_array($value) ? count($value) : 1;
+            if ($valuesCollection->count() != $valueCount) {
                 $this->setIsValid(false);
                 throw new LocalizedException(
                     __(
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product.php b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
index a5fdc264aa1..81e9473e053 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
@@ -505,11 +505,29 @@ public function getProductsIdsBySkus(array $productSkuList)
 
         $result = [];
         foreach ($this->getConnection()->fetchAll($select) as $row) {
-            $result[$row['sku']] = $row['entity_id'];
+            $result[$this->getResultKey($row['sku'], $productSkuList)] = $row['entity_id'];
         }
         return $result;
     }
 
+    /**
+     * Return correct key for result array in getProductIdsBySku
+     * Allows for different case sku to be passed in search array
+     * with original cased sku to be passed back in result array
+     *
+     * @param string $sku
+     * @param array $productSkuList
+     * @return string
+     */
+    private function getResultKey(string $sku, array $productSkuList): string
+    {
+        $key = array_search(strtolower($sku), array_map('strtolower', $productSkuList));
+        if ($key !== false) {
+            $sku = $productSkuList[$key];
+        }
+        return $sku;
+    }
+
     /**
      * Retrieve product entities info
      *
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimator.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimator.php
index a499777df87..24cb4fedd57 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimator.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimator.php
@@ -18,7 +18,7 @@ class CompositeProductRowSizeEstimator implements IndexTableRowSizeEstimatorInte
     /**
      * Calculated memory size for one record in catalog_product_index_price table
      */
-    const MEMORY_SIZE_FOR_ONE_ROW = 200;
+    const MEMORY_SIZE_FOR_ONE_ROW = 250;
 
     /**
      * @var WebsiteManagementInterface
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/IndexTableRowSizeEstimator.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/IndexTableRowSizeEstimator.php
index 89df6677f24..7707fadffe9 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/IndexTableRowSizeEstimator.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/IndexTableRowSizeEstimator.php
@@ -15,7 +15,7 @@ class IndexTableRowSizeEstimator implements \Magento\Framework\Indexer\IndexTabl
     /**
      * Calculated memory size for one record in catalog_product_index_price table
      */
-    const MEMORY_SIZE_FOR_ONE_ROW = 120;
+    const MEMORY_SIZE_FOR_ONE_ROW = 200;
 
     /**
      * @var \Magento\Store\Api\WebsiteManagementInterface
diff --git a/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php b/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php
index f370c49cdfa..e0a92ea0e0b 100644
--- a/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php
+++ b/app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php
@@ -115,7 +115,8 @@ protected function wrapResult($html)
     {
         return '<div class="price-box ' . $this->getData('css_classes') . '" ' .
             'data-role="priceBox" ' .
-            'data-product-id="' . $this->getSaleableItem()->getId() . '"' .
+            'data-product-id="' . $this->getSaleableItem()->getId() . '" ' .
+            'data-price-box="product-id-' . $this->getSaleableItem()->getId() . '"' .
             '>' . $html . '</div>';
     }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageBuilderTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageBuilderTest.php
index dc152aaf058..3094b423a4b 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageBuilderTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/ImageBuilderTest.php
@@ -252,6 +252,7 @@ private function getTestDataWithoutAttributes(): array
                     'custom_attributes' => '',
                     'resized_image_width' => 100,
                     'resized_image_height' => 100,
+                    'product_id' => null
                 ],
             ],
         ];
@@ -286,6 +287,7 @@ private function getTestDataWithAttributes(): array
                     'custom_attributes' => 'name_1="value_1" name_2="value_2"',
                     'resized_image_width' => 120,
                     'resized_image_height' => 70,
+                    'product_id' => null
                 ],
             ],
         ];
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/OptionTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/OptionTest.php
index cd0af471809..1bd85c40532 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/OptionTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/OptionTest.php
@@ -68,4 +68,38 @@ public function testGetRegularPrice()
         $this->model->setPriceType(null);
         $this->assertEquals(50, $this->model->getRegularPrice());
     }
+
+    /**
+     * Tests removing ineligible characters from file_extension.
+     *
+     * @param string $rawExtensions
+     * @param string $expectedExtensions
+     * @dataProvider cleanFileExtensionsDataProvider
+     */
+    public function testCleanFileExtensions(string $rawExtensions, string $expectedExtensions)
+    {
+        $this->model->setType(Option::OPTION_GROUP_FILE);
+        $this->model->setFileExtension($rawExtensions);
+        $this->model->beforeSave();
+        $actualExtensions = $this->model->getFileExtension();
+        $this->assertEquals($expectedExtensions, $actualExtensions);
+    }
+
+    /**
+     * Data provider for testCleanFileExtensions.
+     *
+     * @return array
+     */
+    public function cleanFileExtensionsDataProvider()
+    {
+        return [
+            ['JPG, PNG, GIF', 'jpg, png, gif'],
+            ['jpg, jpg, jpg', 'jpg'],
+            ['jpg, png, gif', 'jpg, png, gif'],
+            ['jpg png gif', 'jpg, png, gif'],
+            ['!jpg@png#gif%', 'jpg, png, gif'],
+            ['jpg, png, 123', 'jpg, png, 123'],
+            ['', ''],
+        ];
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
index 1ba35dde7ad..9c75e8f3469 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php
@@ -330,9 +330,9 @@ protected function setUp()
 
         $this->mediaGalleryEntryFactoryMock =
             $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterfaceFactory::class)
-            ->setMethods(['create'])
-            ->disableOriginalConstructor()
-            ->getMock();
+                ->setMethods(['create'])
+                ->disableOriginalConstructor()
+                ->getMock();
 
         $this->metadataServiceMock = $this->createMock(\Magento\Catalog\Api\ProductAttributeRepositoryInterface::class);
         $this->attributeValueFactory = $this->getMockBuilder(\Magento\Framework\Api\AttributeValueFactory::class)
@@ -1171,19 +1171,19 @@ public function testSetMediaGalleryEntries()
         ];
 
         $entryMock = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface::class)
-                          ->setMethods(
-                              [
-                                  'getId',
-                                  'getFile',
-                                  'getLabel',
-                                  'getPosition',
-                                  'isDisabled',
-                                  'types',
-                                  'getContent',
-                                  'getMediaType'
-                              ]
-                          )
-                          ->getMockForAbstractClass();
+            ->setMethods(
+                [
+                    'getId',
+                    'getFile',
+                    'getLabel',
+                    'getPosition',
+                    'isDisabled',
+                    'types',
+                    'getContent',
+                    'getMediaType'
+                ]
+            )
+            ->getMockForAbstractClass();
 
         $result = [
             'value_id' => 1,
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimatorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimatorTest.php
index 728044b89ca..1c476443381 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimatorTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimatorTest.php
@@ -49,6 +49,7 @@ protected function setUp()
 
     public function testEstimateRowSize()
     {
+        $this->markTestSkipped('Unskip after MAGETWO-89738');
         $expectedResult = 40000000;
         $maxRelatedProductCount = 10;
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/IndexTableRowSizeEstimatorTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/IndexTableRowSizeEstimatorTest.php
index e5720b4f053..0df3c945b28 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/IndexTableRowSizeEstimatorTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Indexer/Price/IndexTableRowSizeEstimatorTest.php
@@ -38,6 +38,7 @@ protected function setUp()
 
     public function testEstimateRowSize()
     {
+        $this->markTestSkipped('Unskip after MAGETWO-89738');
         $expectedValue = 2400000;
 
         $this->websiteManagementMock->expects($this->once())->method('getCount')->willReturn(100);
diff --git a/app/code/Magento/Catalog/Test/Unit/Pricing/Render/FinalPriceBoxTest.php b/app/code/Magento/Catalog/Test/Unit/Pricing/Render/FinalPriceBoxTest.php
index e4f19e550a1..90384c122f0 100644
--- a/app/code/Magento/Catalog/Test/Unit/Pricing/Render/FinalPriceBoxTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Pricing/Render/FinalPriceBoxTest.php
@@ -246,7 +246,8 @@ public function testRenderMsrpEnabled()
 
         //assert price wrapper
         $this->assertEquals(
-            '<div class="price-box price-final_price" data-role="priceBox" data-product-id="">test</div>',
+            '<div class="price-box price-final_price" data-role="priceBox" data-product-id="" ' .
+            'data-price-box="product-id-">test</div>',
             $result
         );
     }
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
index 7995926d27d..7196a721f1d 100755
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php
@@ -1046,6 +1046,7 @@ protected function getFileExtensionFieldConfig($sortOrder)
                 'data' => [
                     'config' => [
                         'label' => __('Compatible File Extensions'),
+                        'notice' => __('Enter separated extensions, like: png, jpg, gif.'),
                         'componentType' => Field::NAME,
                         'formElement' => Input::NAME,
                         'dataScope' => static::FIELD_FILE_EXTENSION_NAME,
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php
index e31eca89f63..200ecf89641 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductDataProvider.php
@@ -6,6 +6,9 @@
 namespace Magento\Catalog\Ui\DataProvider\Product;
 
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Ui\DataProvider\Modifier\ModifierInterface;
+use Magento\Ui\DataProvider\Modifier\PoolInterface;
 
 /**
  * Class ProductDataProvider
@@ -33,8 +36,11 @@ class ProductDataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
     protected $addFilterStrategies;
 
     /**
-     * Construct
-     *
+     * @var PoolInterface
+     */
+    private $modifiersPool;
+
+    /**
      * @param string $name
      * @param string $primaryFieldName
      * @param string $requestFieldName
@@ -43,6 +49,7 @@ class ProductDataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      * @param \Magento\Ui\DataProvider\AddFilterToCollectionInterface[] $addFilterStrategies
      * @param array $meta
      * @param array $data
+     * @param PoolInterface|null $modifiersPool
      */
     public function __construct(
         $name,
@@ -52,12 +59,14 @@ public function __construct(
         array $addFieldStrategies = [],
         array $addFilterStrategies = [],
         array $meta = [],
-        array $data = []
+        array $data = [],
+        PoolInterface $modifiersPool = null
     ) {
         parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
         $this->collection = $collectionFactory->create();
         $this->addFieldStrategies = $addFieldStrategies;
         $this->addFilterStrategies = $addFilterStrategies;
+        $this->modifiersPool = $modifiersPool ?: ObjectManager::getInstance()->get(PoolInterface::class);
     }
 
     /**
@@ -72,10 +81,16 @@ public function getData()
         }
         $items = $this->getCollection()->toArray();
 
-        return [
+        $data = [
             'totalRecords' => $this->getCollection()->getSize(),
             'items' => array_values($items),
         ];
+
+        /** @var ModifierInterface $modifier */
+        foreach ($this->modifiersPool->getModifiersInstances() as $modifier) {
+            $data = $modifier->modifyData($data);
+        }
+        return $data;
     }
 
     /**
@@ -110,4 +125,19 @@ public function addFilter(\Magento\Framework\Api\Filter $filter)
             parent::addFilter($filter);
         }
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getMeta()
+    {
+        $meta = parent::getMeta();
+
+        /** @var ModifierInterface $modifier */
+        foreach ($this->modifiersPool->getModifiersInstances() as $modifier) {
+            $meta = $modifier->modifyMeta($meta);
+        }
+
+        return $meta;
+    }
 }
diff --git a/app/code/Magento/Catalog/etc/adminhtml/di.xml b/app/code/Magento/Catalog/etc/adminhtml/di.xml
index 6d703208077..4081827f0c8 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/di.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/di.xml
@@ -92,6 +92,7 @@
                 <item name="store_id" xsi:type="object">Magento\Catalog\Ui\DataProvider\Product\AddStoreFieldToCollection</item>
             </argument>
             <argument name="collectionFactory" xsi:type="object">\Magento\Catalog\Ui\DataProvider\Product\ProductCollectionFactory</argument>
+            <argument name="modifiersPool" xsi:type="object">Magento\Catalog\Ui\DataProvider\Product\Listing\Modifier\Pool</argument>
         </arguments>
     </type>
     <type name="Magento\Catalog\Model\Product\Action">
@@ -165,6 +166,7 @@
             <argument name="pool" xsi:type="object">Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Pool</argument>
         </arguments>
     </type>
+    <virtualType name="Magento\Catalog\Ui\DataProvider\Product\Listing\Modifier\Pool" type="Magento\Ui\DataProvider\Modifier\Pool"/>
     <type name="Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\CustomOptions">
         <arguments>
             <argument name="scopeName" xsi:type="string">product_form.product_form</argument>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
index c7f57710709..9c18a18ff58 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml
@@ -40,17 +40,6 @@
     </div>
 </div>
 <?php endif; ?>
-<?php if ($block->isRedirectToCartEnabled()) : ?>
-<script type="text/x-magento-init">
-    {
-        "#product_addtocart_form": {
-            "Magento_Catalog/product/view/validation": {
-                "radioCheckboxClosest": ".nested"
-            }
-        }
-    }
-</script>
-<?php else : ?>
 <script type="text/x-magento-init">
     {
         "#product_addtocart_form": {
@@ -58,4 +47,3 @@
         }
     }
 </script>
-<?php endif; ?>
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index f6d85b57ab0..c4148cd9008 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -9,6 +9,7 @@
 use Magento\ImportExport\Model\Import;
 use \Magento\Store\Model\Store;
 use \Magento\CatalogImportExport\Model\Import\Product as ImportProduct;
+use Magento\Catalog\Model\Product as ProductEntity;
 
 /**
  * Export entity product model
@@ -917,6 +918,29 @@ protected function getExportData()
         return $exportData;
     }
 
+    /**
+     * Load products' data from the collection
+     * and filter it (if needed).
+     *
+     * @return array Keys are product IDs, values arrays with keys as store IDs
+     *               and values as store-specific versions of Product entity.
+     */
+    protected function loadCollection(): array
+    {
+        $data = [];
+
+        $collection = $this->_getEntityCollection();
+        foreach (array_keys($this->_storeIdToCode) as $storeId) {
+            $collection->setStoreId($storeId);
+            foreach ($collection as $itemId => $item) {
+                $data[$itemId][$storeId] = $item;
+            }
+        }
+        $collection->clear();
+
+        return $data;
+    }
+
     /**
      * Collect export data for all products
      *
@@ -927,14 +951,15 @@ protected function getExportData()
     protected function collectRawData()
     {
         $data = [];
-        $collection = $this->_getEntityCollection();
-        foreach ($this->_storeIdToCode as $storeId => $storeCode) {
-            $collection->setStoreId($storeId);
-            /**
-             * @var int $itemId
-             * @var \Magento\Catalog\Model\Product $item
-             */
-            foreach ($collection as $itemId => $item) {
+        $items = $this->loadCollection();
+
+        /**
+         * @var int $itemId
+         * @var ProductEntity[] $itemByStore
+         */
+        foreach ($items as $itemId => $itemByStore) {
+            foreach ($this->_storeIdToCode as $storeId => $storeCode) {
+                $item = $itemByStore[$storeId];
                 $additionalAttributes = [];
                 $productLinkId = $item->getData($this->getProductEntityLinkField());
                 foreach ($this->_getExportAttrCodes() as $code) {
@@ -1012,7 +1037,6 @@ protected function collectRawData()
                 $data[$itemId][$storeId]['product_id'] = $itemId;
                 $data[$itemId][$storeId]['product_link_id'] = $productLinkId;
             }
-            $collection->clear();
         }
 
         return $data;
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 58e2b13b192..9922a313dc4 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -10,6 +10,7 @@
 use Magento\CatalogImportExport\Model\Import\Product\MediaGalleryProcessor;
 use Magento\CatalogImportExport\Model\Import\Product\ImageTypeProcessor;
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface as ValidatorInterface;
+use Magento\CatalogImportExport\Model\StockItemImporterInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
@@ -535,6 +536,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
 
     /**
      * @var \Magento\CatalogInventory\Model\ResourceModel\Stock\ItemFactory
+     * @deprecated this variable isn't used anymore.
      */
     protected $_stockResItemFac;
 
@@ -703,6 +705,13 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      */
     private $catalogConfig;
 
+    /**
+     * Stock Item Importer
+     *
+     * @var StockItemImporterInterface
+     */
+    private $stockItemImporter;
+
     /**
      * @var ImageTypeProcessor
      */
@@ -751,12 +760,13 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * @param TransactionManagerInterface $transactionManager
      * @param Product\TaxClassProcessor $taxClassProcessor
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Catalog\Model\Product\Url $productUrl
      * @param array $data
      * @param array $dateAttrCodes
      * @param CatalogConfig $catalogConfig
      * @param ImageTypeProcessor $imageTypeProcessor
      * @param MediaGalleryProcessor $mediaProcessor
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @param StockItemImporterInterface|null $stockItemImporter
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -801,7 +811,8 @@ public function __construct(
         array $dateAttrCodes = [],
         CatalogConfig $catalogConfig = null,
         ImageTypeProcessor $imageTypeProcessor = null,
-        MediaGalleryProcessor $mediaProcessor = null
+        MediaGalleryProcessor $mediaProcessor = null,
+        StockItemImporterInterface $stockItemImporter = null
     ) {
         $this->_eventManager = $eventManager;
         $this->stockRegistry = $stockRegistry;
@@ -835,7 +846,8 @@ public function __construct(
         $this->catalogConfig = $catalogConfig ?: ObjectManager::getInstance()->get(CatalogConfig::class);
         $this->imageTypeProcessor = $imageTypeProcessor ?: ObjectManager::getInstance()->get(ImageTypeProcessor::class);
         $this->mediaProcessor = $mediaProcessor ?: ObjectManager::getInstance()->get(MediaGalleryProcessor::class);
-
+        $this->stockItemImporter = $stockItemImporter ?: ObjectManager::getInstance()
+            ->get(StockItemImporterInterface::class);
         parent::__construct(
             $jsonHelper,
             $importExportData,
@@ -851,7 +863,6 @@ public function __construct(
         ) ? $data['option_entity'] : $optionFactory->create(
             ['data' => ['product_entity' => $this]]
         );
-
         $this->_initAttributeSets()
             ->_initTypeModels()
             ->_initSkus()
@@ -2128,9 +2139,6 @@ protected function _saveProductWebsites(array $websiteData)
      */
     protected function _saveStockItem()
     {
-        /** @var $stockResource \Magento\CatalogInventory\Model\ResourceModel\Stock\Item */
-        $stockResource = $this->_stockResItemFac->create();
-        $entityTable = $stockResource->getMainTable();
         while ($bunch = $this->_dataSourceModel->getNextBunch()) {
             $stockData = [];
             $productIdsToReindex = [];
@@ -2158,6 +2166,7 @@ protected function _saveStockItem()
                         array_intersect_key($rowData, $this->defaultStockData),
                         $row
                     );
+                    $row['sku'] = $sku;
 
                     if ($this->stockConfiguration->isQty(
                         $this->skuProcessor->getNewSku($sku)['type_id']
@@ -2185,7 +2194,7 @@ protected function _saveStockItem()
 
             // Insert rows
             if (!empty($stockData)) {
-                $this->_connection->insertOnDuplicate($entityTable, array_values($stockData));
+                $this->stockItemImporter->import($stockData);
             }
 
             $this->reindexProducts($productIdsToReindex);
diff --git a/app/code/Magento/CatalogImportExport/Model/StockItemImporter.php b/app/code/Magento/CatalogImportExport/Model/StockItemImporter.php
new file mode 100644
index 00000000000..0e8d3c5fa4c
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Model/StockItemImporter.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogImportExport\Model;
+
+use Magento\CatalogInventory\Model\ResourceModel\Stock\Item;
+use Magento\CatalogInventory\Model\ResourceModel\Stock\ItemFactory;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Psr\Log\LoggerInterface;
+
+class StockItemImporter implements StockItemImporterInterface
+{
+    /**
+     * Stock Item Resource Factory
+     *
+     * @var ItemFactory $stockResourceItemFactory
+     */
+    private $stockResourceItemFactory;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * StockItemImporter constructor
+     *
+     * @param ItemFactory $stockResourceItemFactory
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        ItemFactory $stockResourceItemFactory,
+        LoggerInterface $logger
+    ) {
+        $this->stockResourceItemFactory = $stockResourceItemFactory;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function import(array $stockData)
+    {
+        /** @var $stockItemResource Item */
+        $stockItemResource = $this->stockResourceItemFactory->create();
+        $entityTable = $stockItemResource->getMainTable();
+        try {
+            $stockImportData = array_map(
+                function ($stockItemData) {
+                    unset($stockItemData['sku']);
+                    return $stockItemData;
+                },
+                array_values($stockData)
+            );
+            $stockItemResource->getConnection()->insertOnDuplicate($entityTable, $stockImportData);
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage());
+            throw new CouldNotSaveException(__('Invalid Stock data for insert'), $e);
+        }
+    }
+}
diff --git a/app/code/Magento/CatalogImportExport/Model/StockItemImporterInterface.php b/app/code/Magento/CatalogImportExport/Model/StockItemImporterInterface.php
new file mode 100644
index 00000000000..bc314d825ba
--- /dev/null
+++ b/app/code/Magento/CatalogImportExport/Model/StockItemImporterInterface.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogImportExport\Model;
+
+/**
+ * Interface StockItemImporterInterface
+ *
+ * @api
+ */
+interface StockItemImporterInterface
+{
+    /**
+     * Handle Import of Stock Item Data
+     *
+     * @param array $stockData
+     * @return void
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Validation\ValidationException
+     */
+    public function import(array $stockData);
+}
diff --git a/app/code/Magento/CatalogImportExport/etc/di.xml b/app/code/Magento/CatalogImportExport/etc/di.xml
index 53772c3b336..6906272b11d 100644
--- a/app/code/Magento/CatalogImportExport/etc/di.xml
+++ b/app/code/Magento/CatalogImportExport/etc/di.xml
@@ -7,6 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\CatalogImportExport\Model\Export\RowCustomizerInterface" type="Magento\CatalogImportExport\Model\Export\RowCustomizer\Composite" />
+    <preference for="Magento\CatalogImportExport\Model\StockItemImporterInterface" type="Magento\CatalogImportExport\Model\StockItemImporter" />
     <type name="Magento\ImportExport\Model\Import">
         <plugin name="catalogProductFlatIndexerImport" type="Magento\CatalogImportExport\Model\Indexer\Product\Flat\Plugin\Import" />
         <plugin name="invalidatePriceIndexerOnImport" type="Magento\CatalogImportExport\Model\Indexer\Product\Price\Plugin\Import" />
diff --git a/app/code/Magento/CatalogInventory/Api/RegisterProductSaleInterface.php b/app/code/Magento/CatalogInventory/Api/RegisterProductSaleInterface.php
new file mode 100644
index 00000000000..9122fb00386
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Api/RegisterProductSaleInterface.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventory\Api;
+
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * @api
+ */
+interface RegisterProductSaleInterface
+{
+    /**
+     * Subtract product qtys from stock
+     * Return array of items that require full save
+     *
+     * Method signature is unchanged for backward compatibility
+     *
+     * @param float[] $items
+     * @param int $websiteId
+     * @return StockItemInterface[]
+     * @throws LocalizedException
+     */
+    public function registerProductsSale($items, $websiteId = null);
+}
diff --git a/app/code/Magento/CatalogInventory/Api/RevertProductSaleInterface.php b/app/code/Magento/CatalogInventory/Api/RevertProductSaleInterface.php
new file mode 100644
index 00000000000..ed496f3882f
--- /dev/null
+++ b/app/code/Magento/CatalogInventory/Api/RevertProductSaleInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogInventory\Api;
+
+/**
+ * @api
+ */
+interface RevertProductSaleInterface
+{
+    /**
+     * Revert register product sale
+     *
+     * Method signature is unchanged for backward compatibility
+     *
+     * @param string[] $items
+     * @param int $websiteId
+     * @return bool
+     */
+    public function revertProductsSale($items, $websiteId = null);
+}
diff --git a/app/code/Magento/CatalogInventory/Helper/Stock.php b/app/code/Magento/CatalogInventory/Helper/Stock.php
index 410e35096ee..56ad3742d8a 100644
--- a/app/code/Magento/CatalogInventory/Helper/Stock.php
+++ b/app/code/Magento/CatalogInventory/Helper/Stock.php
@@ -17,6 +17,7 @@
 /**
  * Class Stock
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @api
  */
 class Stock
 {
diff --git a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
index 8e0c749be2d..0cc77bb7caf 100644
--- a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
+++ b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
@@ -104,8 +104,7 @@ public function validate(Observer $observer)
         $quoteItem = $observer->getEvent()->getItem();
         if (!$quoteItem ||
             !$quoteItem->getProductId() ||
-            !$quoteItem->getQuote() ||
-            $quoteItem->getQuote()->getIsSuperMode()
+            !$quoteItem->getQuote()
         ) {
             return;
         }
@@ -118,6 +117,18 @@ public function validate(Observer $observer)
             throw new LocalizedException(__('The Product stock item is invalid. Verify the stock item and try again.'));
         }
 
+        if (($options = $quoteItem->getQtyOptions()) && $qty > 0) {
+            foreach ($options as $option) {
+                $this->optionInitializer->initialize($option, $quoteItem, $qty);
+            }
+        } else {
+            $this->stockItemInitializer->initialize($stockItem, $quoteItem, $qty);
+        }
+
+        if ($quoteItem->getQuote()->getIsSuperMode()) {
+            return;
+        }
+
         /* @var \Magento\CatalogInventory\Api\Data\StockStatusInterface $stockStatus */
         $stockStatus = $this->stockRegistry->getStockStatus($product->getId(), $product->getStore()->getWebsiteId());
 
@@ -160,7 +171,7 @@ public function validate(Observer $observer)
         /**
          * Check item for options
          */
-        if (($options = $quoteItem->getQtyOptions()) && $qty > 0) {
+        if ($options) {
             $qty = $product->getTypeInstance()->prepareQuoteItemQty($qty, $product);
             $quoteItem->setData('qty', $qty);
             if ($stockStatus) {
@@ -194,7 +205,7 @@ public function validate(Observer $observer)
             $removeError = true;
 
             foreach ($options as $option) {
-                $result = $this->optionInitializer->initialize($option, $quoteItem, $qty);
+                $result = $option->getStockStateResult();
                 if ($result->getHasError()) {
                     $option->setHasError(true);
                     //Setting this to false, so no error statuses are cleared
@@ -207,7 +218,7 @@ public function validate(Observer $observer)
             }
         } else {
             if ($quoteItem->getParentItem() === null) {
-                $result = $this->stockItemInitializer->initialize($stockItem, $quoteItem, $qty);
+                $result = $quoteItem->getStockStateResult();
                 if ($result->getHasError()) {
                     $this->addErrorInfoToQuote($result, $quoteItem);
                 } else {
diff --git a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/Option.php b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/Option.php
index 3e972a1b842..b99e43d52f4 100644
--- a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/Option.php
+++ b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/Option.php
@@ -133,6 +133,8 @@ public function initialize(
 
         $stockItem->unsIsChildItem();
 
+        $option->setStockStateResult($result);
+
         return $result;
     }
 }
diff --git a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php
index 6bdc4c67de6..6fb0a949941 100644
--- a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php
+++ b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator/Initializer/StockItem.php
@@ -135,6 +135,8 @@ public function initialize(
             $quoteItem->setBackorders($result->getItemBackorders());
         }
 
+        $quoteItem->setStockStateResult($result);
+
         return $result;
     }
 }
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
index 4e04ed059c8..bc5fda4939a 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status.php
@@ -12,6 +12,7 @@
 /**
  * CatalogInventory Stock Status per website Resource Model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @api
  */
 class Status extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
diff --git a/app/code/Magento/CatalogInventory/Model/StockManagement.php b/app/code/Magento/CatalogInventory/Model/StockManagement.php
index 06599446a9e..02c09aef0ef 100644
--- a/app/code/Magento/CatalogInventory/Model/StockManagement.php
+++ b/app/code/Magento/CatalogInventory/Model/StockManagement.php
@@ -6,6 +6,8 @@
 namespace Magento\CatalogInventory\Model;
 
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\CatalogInventory\Api\RegisterProductSaleInterface;
+use Magento\CatalogInventory\Api\RevertProductSaleInterface;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\CatalogInventory\Api\StockManagementInterface;
 use Magento\CatalogInventory\Model\ResourceModel\QtyCounterInterface;
@@ -14,9 +16,9 @@
 use Magento\CatalogInventory\Model\ResourceModel\Stock as ResourceStock;
 
 /**
- * Class StockManagement
+ * Implements a few interfaces for backward compatibility
  */
-class StockManagement implements StockManagementInterface
+class StockManagement implements StockManagementInterface, RegisterProductSaleInterface, RevertProductSaleInterface
 {
     /**
      * @var StockRegistryProviderInterface
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistryStorage.php b/app/code/Magento/CatalogInventory/Model/StockRegistryStorage.php
index af417954a84..0a54adfe91c 100644
--- a/app/code/Magento/CatalogInventory/Model/StockRegistryStorage.php
+++ b/app/code/Magento/CatalogInventory/Model/StockRegistryStorage.php
@@ -130,4 +130,16 @@ public function removeStockStatus($productId, $scopeId = null)
             unset($this->stockStatuses[$productId][$scopeId]);
         }
     }
+
+    /**
+     * Clear cached entities
+     *
+     * @return void
+     */
+    public function clean()
+    {
+        $this->stockItems = [];
+        $this->stocks = [];
+        $this->stockStatuses = [];
+    }
 }
diff --git a/app/code/Magento/CatalogInventory/Observer/ItemsForReindex.php b/app/code/Magento/CatalogInventory/Observer/ItemsForReindex.php
index 1055afd263d..88dab3026c9 100644
--- a/app/code/Magento/CatalogInventory/Observer/ItemsForReindex.php
+++ b/app/code/Magento/CatalogInventory/Observer/ItemsForReindex.php
@@ -11,7 +11,7 @@ class ItemsForReindex
     /**
      * @var array
      */
-    protected $itemsForReindex;
+    protected $itemsForReindex = [];
 
     /**
      * @param array $items
diff --git a/app/code/Magento/CatalogInventory/Observer/ProcessInventoryDataObserver.php b/app/code/Magento/CatalogInventory/Observer/ProcessInventoryDataObserver.php
index cea19c098b9..b831af53d4a 100644
--- a/app/code/Magento/CatalogInventory/Observer/ProcessInventoryDataObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/ProcessInventoryDataObserver.php
@@ -63,11 +63,11 @@ public function execute(EventObserver $observer)
      */
     private function processStockData(Product $product)
     {
-        /** @var Item $stockItem */
-        $stockItem = $this->stockRegistry->getStockItem($product->getId(), $product->getStore()->getWebsiteId());
-
         $quantityAndStockStatus = $product->getData('quantity_and_stock_status');
         if (is_array($quantityAndStockStatus)) {
+            /** @var Item $stockItem */
+            $stockItem = $this->stockRegistry->getStockItem($product->getId(), $product->getStore()->getWebsiteId());
+
             $quantityAndStockStatus = $this->prepareQuantityAndStockStatus($stockItem, $quantityAndStockStatus);
 
             if ($quantityAndStockStatus) {
diff --git a/app/code/Magento/CatalogInventory/Observer/SubtractQuoteInventoryObserver.php b/app/code/Magento/CatalogInventory/Observer/SubtractQuoteInventoryObserver.php
index 6fbec08e480..01689eb7c90 100644
--- a/app/code/Magento/CatalogInventory/Observer/SubtractQuoteInventoryObserver.php
+++ b/app/code/Magento/CatalogInventory/Observer/SubtractQuoteInventoryObserver.php
@@ -74,8 +74,9 @@ public function execute(EventObserver $observer)
             $items,
             $quote->getStore()->getWebsiteId()
         );
-        $this->itemsForReindex->setItems($itemsForReindex);
-
+        if (count($itemsForReindex)) {
+            $this->itemsForReindex->setItems($itemsForReindex);
+        }
         $quote->setInventoryProcessed(true);
         return $this;
     }
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/QuantityValidatorTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/QuantityValidatorTest.php
index 86a021768a6..11a04d26994 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/QuantityValidatorTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/QuantityValidatorTest.php
@@ -278,8 +278,11 @@ public function testValidateWithOptions()
     {
         $optionMock = $this->getMockBuilder(OptionItem::class)
             ->disableOriginalConstructor()
-            ->setMethods(['setHasError'])
+            ->setMethods(['setHasError', 'getStockStateResult'])
             ->getMock();
+        $optionMock->expects($this->once())
+            ->method('getStockStateResult')
+            ->willReturn($this->resultMock);
         $this->stockRegistryMock->expects($this->at(0))
             ->method('getStockItem')
             ->willReturn($this->stockItemMock);
@@ -316,7 +319,7 @@ public function testValidateWithOptionsAndError()
     {
         $optionMock = $this->getMockBuilder(OptionItem::class)
             ->disableOriginalConstructor()
-            ->setMethods(['setHasError'])
+            ->setMethods(['setHasError', 'getStockStateResult'])
             ->getMock();
         $this->stockRegistryMock->expects($this->at(0))
             ->method('getStockItem')
@@ -324,6 +327,9 @@ public function testValidateWithOptionsAndError()
         $this->stockRegistryMock->expects($this->at(1))
             ->method('getStockStatus')
             ->willReturn($this->stockStatusMock);
+        $optionMock->expects($this->once())
+            ->method('getStockStateResult')
+            ->willReturn($this->resultMock);
         $options = [$optionMock];
         $this->createInitialStub(1);
         $this->setUpStubForQuantity(1, true);
@@ -354,12 +360,15 @@ public function testValidateAndRemoveErrorsFromQuote()
     {
         $optionMock = $this->getMockBuilder(OptionItem::class)
             ->disableOriginalConstructor()
-            ->setMethods(['setHasError'])
+            ->setMethods(['setHasError', 'getStockStateResult'])
             ->getMock();
         $quoteItem = $this->getMockBuilder(Item::class)
             ->disableOriginalConstructor()
             ->setMethods(['getItemId', 'getErrorInfos'])
             ->getMock();
+        $optionMock->expects($this->once())
+            ->method('getStockStateResult')
+            ->willReturn($this->resultMock);
         $this->stockRegistryMock->expects($this->at(0))
             ->method('getStockItem')
             ->willReturn($this->stockItemMock);
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/StockItemTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/StockItemTest.php
index d60a1f3e400..8c9a1aa7715 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/StockItemTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Quote/Item/QuantityValidator/Initializer/StockItemTest.php
@@ -84,6 +84,7 @@ public function testInitializeWithSubitem()
                     'setMessage',
                     'setBackorders',
                     '__wakeup',
+                    'setStockStateResult'
                 ]
             )
             ->disableOriginalConstructor()
@@ -178,6 +179,7 @@ public function testInitializeWithSubitem()
         $quoteItem->expects($this->once())->method('setMessage')->with('message')->will($this->returnSelf());
         $result->expects($this->exactly(2))->method('getItemBackorders')->will($this->returnValue('backorders'));
         $quoteItem->expects($this->once())->method('setBackorders')->with('backorders')->will($this->returnSelf());
+        $quoteItem->expects($this->once())->method('setStockStateResult')->with($result)->will($this->returnSelf());
 
         $this->model->initialize($stockItem, $quoteItem, $qty);
     }
diff --git a/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php b/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php
index c5d18ea7275..d15f17530ff 100644
--- a/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php
+++ b/app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php
@@ -210,7 +210,6 @@ private function prepareMeta()
                     'scopeLabel' => '[GLOBAL]',
                 ]
             );
-
             $container['arguments']['data']['config'] = [
                 'formElement' => 'container',
                 'componentType' => 'container',
@@ -227,6 +226,7 @@ private function prepareMeta()
             ];
             $qty['arguments']['data']['config'] = [
                 'component' => 'Magento_CatalogInventory/js/components/qty-validator-changer',
+                'group' => 'quantity_and_stock_status_qty',
                 'dataType' => 'number',
                 'formElement' => 'input',
                 'componentType' => 'field',
diff --git a/app/code/Magento/CatalogInventory/etc/db_schema.xml b/app/code/Magento/CatalogInventory/etc/db_schema.xml
index 82372f7f605..8a6ae8d2d93 100644
--- a/app/code/Magento/CatalogInventory/etc/db_schema.xml
+++ b/app/code/Magento/CatalogInventory/etc/db_schema.xml
@@ -84,10 +84,6 @@
             <column name="product_id"/>
             <column name="stock_id"/>
         </constraint>
-        <constraint xsi:type="unique" name="CATALOGINVENTORY_STOCK_ITEM_PRODUCT_ID_WEBSITE_ID">
-            <column name="product_id"/>
-            <column name="website_id"/>
-        </constraint>
         <index name="CATALOGINVENTORY_STOCK_ITEM_WEBSITE_ID" indexType="btree">
             <column name="website_id"/>
         </index>
diff --git a/app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml b/app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml
index 3472f4368d6..c27a6555e71 100644
--- a/app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml
+++ b/app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml
@@ -99,6 +99,9 @@
                     </validation>
                     <label translate="true">Qty</label>
                     <dataScope>quantity_and_stock_status.qty</dataScope>
+                    <links>
+                        <link name="value">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:value</link>
+                    </links>
                     <imports>
                         <link name="handleChanges">${$.provider}:data.product.stock_data.is_qty_decimal</link>
                         <link name="visible">${$.provider}:data.product.stock_data.manage_stock</link>
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
index 5887c76e8dd..64a776e7354 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php
@@ -3,13 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation;
 
 use Magento\Catalog\Model\Product;
-use Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider\QueryBuilder;
-use Magento\Customer\Model\Session;
+use Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider\SelectBuilderForAttribute;
 use Magento\Eav\Model\Config;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\App\ScopeResolverInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
@@ -17,11 +16,7 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Adapter\Mysql\Aggregation\DataProviderInterface;
 use Magento\Framework\Search\Request\BucketInterface;
-use Magento\Framework\App\ObjectManager;
 
-/**
- * DataProvider for Catalog search Mysql.
- */
 class DataProvider implements DataProviderInterface
 {
     /**
@@ -29,51 +24,42 @@ class DataProvider implements DataProviderInterface
      */
     private $eavConfig;
 
-    /**
-     * @var Resource
-     */
-    private $resource;
-
     /**
      * @var ScopeResolverInterface
      */
     private $scopeResolver;
 
-    /**
-     * @var Session
-     */
-    private $customerSession;
-
     /**
      * @var AdapterInterface
      */
     private $connection;
 
     /**
-     * @var QueryBuilder;
+     * @var SelectBuilderForAttribute
      */
-    private $queryBuilder;
+    private $selectBuilderForAttribute;
 
     /**
      * @param Config $eavConfig
      * @param ResourceConnection $resource
      * @param ScopeResolverInterface $scopeResolver
-     * @param Session $customerSession
-     * @param QueryBuilder|null $queryBuilder
+     * @param null $customerSession @deprecated
+     * @param SelectBuilderForAttribute|null $selectBuilderForAttribute
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         Config $eavConfig,
         ResourceConnection $resource,
         ScopeResolverInterface $scopeResolver,
-        Session $customerSession,
-        QueryBuilder $queryBuilder = null
+        $customerSession,
+        SelectBuilderForAttribute $selectBuilderForAttribute = null
     ) {
         $this->eavConfig = $eavConfig;
-        $this->resource = $resource;
         $this->connection = $resource->getConnection();
         $this->scopeResolver = $scopeResolver;
-        $this->customerSession = $customerSession;
-        $this->queryBuilder = $queryBuilder ?: ObjectManager::getInstance()->get(QueryBuilder::class);
+        $this->selectBuilderForAttribute = $selectBuilderForAttribute
+            ?: ObjectManager::getInstance()->get(SelectBuilderForAttribute::class);
     }
 
     /**
@@ -85,15 +71,15 @@ public function getDataSet(
         Table $entityIdsTable
     ) {
         $currentScope = $this->scopeResolver->getScope($dimensions['scope']->getValue())->getId();
-
         $attribute = $this->eavConfig->getAttribute(Product::ENTITY, $bucket->getField());
+        $select = $this->getSelect();
 
-        $select = $this->queryBuilder->build(
-            $attribute,
-            $entityIdsTable->getName(),
-            $currentScope,
-            $this->customerSession->getCustomerGroupId()
+        $select->joinInner(
+            ['entities' => $entityIdsTable->getName()],
+            'main_table.entity_id  = entities.entity_id',
+            []
         );
+        $select = $this->selectBuilderForAttribute->build($select, $attribute, $currentScope);
 
         return $select;
     }
@@ -105,4 +91,12 @@ public function execute(Select $select)
     {
         return $this->connection->fetchAssoc($select);
     }
+
+    /**
+     * @return Select
+     */
+    private function getSelect()
+    {
+        return $this->connection->select();
+    }
 }
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/SelectBuilderForAttribute.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/SelectBuilderForAttribute.php
new file mode 100644
index 00000000000..be0a9833913
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/SelectBuilderForAttribute.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider;
+
+use Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider\SelectBuilderForAttribute\
+ApplyStockConditionToSelect;
+use Magento\Customer\Model\Session;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\Search\Request\BucketInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
+
+/**
+ * Build select for attribute.
+ */
+class SelectBuilderForAttribute
+{
+    /**
+     * @var ScopeResolverInterface
+     */
+    private $scopeResolver;
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var ApplyStockConditionToSelect
+     */
+    private $applyStockConditionToSelect;
+
+    /**
+     * @var Session
+     */
+    private $customerSession;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ResourceConnection $resource
+     * @param ScopeResolverInterface $scopeResolver
+     * @param ApplyStockConditionToSelect $applyStockConditionToSelect
+     * @param Session $customerSession
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        ResourceConnection $resource,
+        ScopeResolverInterface $scopeResolver,
+        ApplyStockConditionToSelect $applyStockConditionToSelect,
+        Session $customerSession,
+        ScopeConfigInterface $scopeConfig
+    ) {
+        $this->resource = $resource;
+        $this->scopeResolver = $scopeResolver;
+        $this->applyStockConditionToSelect = $applyStockConditionToSelect;
+        $this->customerSession = $customerSession;
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * @param Select $select
+     * @param AbstractAttribute $attribute
+     * @param int $currentScope
+     *
+     * @return Select
+     */
+    public function build(Select $select, AbstractAttribute $attribute, int $currentScope): Select
+    {
+        if ($attribute->getAttributeCode() === 'price') {
+            /** @var Store $store */
+            $store = $this->scopeResolver->getScope($currentScope);
+            if (!$store instanceof Store) {
+                throw new \RuntimeException('Illegal scope resolved');
+            }
+            $table = $this->resource->getTableName('catalog_product_index_price');
+            $select->from(['main_table' => $table], null)
+                ->columns([BucketInterface::FIELD_VALUE => 'main_table.min_price'])
+                ->where('main_table.customer_group_id = ?', $this->customerSession->getCustomerGroupId())
+                ->where('main_table.website_id = ?', $store->getWebsiteId());
+        } else {
+            $currentScopeId = $this->scopeResolver->getScope($currentScope)->getId();
+            $table = $this->resource->getTableName(
+                'catalog_product_index_eav' . ($attribute->getBackendType() === 'decimal' ? '_decimal' : '')
+            );
+            $subSelect = $select;
+            $subSelect->from(['main_table' => $table], ['main_table.entity_id', 'main_table.value'])
+                ->distinct()
+                ->where('main_table.attribute_id = ?', $attribute->getAttributeId())
+                ->where('main_table.store_id = ? ', $currentScopeId);
+            if ($this->isAddStockFilter()) {
+                $subSelect = $this->applyStockConditionToSelect->execute($subSelect);
+            }
+
+            $parentSelect = $this->resource->getConnection()->select();
+            $parentSelect->from(['main_table' => $subSelect], ['main_table.value']);
+            $select = $parentSelect;
+        }
+
+        return $select;
+    }
+
+    /**
+     * @return bool
+     */
+    private function isAddStockFilter()
+    {
+        $isShowOutOfStock = $this->scopeConfig->isSetFlag(
+            'cataloginventory/options/show_out_of_stock',
+            ScopeInterface::SCOPE_STORE
+        );
+
+        return false === $isShowOutOfStock;
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/SelectBuilderForAttribute/ApplyStockConditionToSelect.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/SelectBuilderForAttribute/ApplyStockConditionToSelect.php
new file mode 100644
index 00000000000..83f9c6f9c30
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider/SelectBuilderForAttribute/ApplyStockConditionToSelect.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider\SelectBuilderForAttribute;
+
+use Magento\CatalogInventory\Model\Stock;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Select;
+
+/**
+ * Join stock table with stock condition to select.
+ */
+class ApplyStockConditionToSelect
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @param ResourceConnection $resource
+     */
+    public function __construct(
+        ResourceConnection $resource
+    ) {
+        $this->resource = $resource;
+    }
+
+    /**
+     * @param Select $select
+     * @return Select
+     */
+    public function execute(Select $select): Select
+    {
+        $select->joinInner(
+            ['stock_index' => $this->resource->getTableName('cataloginventory_stock_status')],
+            'main_table.source_id = stock_index.product_id',
+            []
+        )->where('stock_index.stock_status = ?', Stock::STOCK_IN_STOCK);
+
+        return $select;
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Model/Fulltext.php b/app/code/Magento/CatalogSearch/Model/Fulltext.php
index 838d0aa9067..1792fd21fb8 100644
--- a/app/code/Magento/CatalogSearch/Model/Fulltext.php
+++ b/app/code/Magento/CatalogSearch/Model/Fulltext.php
@@ -73,6 +73,8 @@ protected function _construct()
      * Reset search results cache
      *
      * @return $this
+     * @deprecated Not used anymore
+     * @see \Magento\CatalogSearch\Model\ResourceModel\Fulltext::resetSearchResultsByStore
      */
     public function resetSearchResults()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
index 9009a40c19d..d8356fd6725 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php
@@ -6,12 +6,10 @@
 namespace Magento\CatalogSearch\Model\Indexer;
 
 use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\FullFactory;
-use Magento\CatalogSearch\Model\Indexer\Scope\State;
+use Magento\CatalogSearch\Model\Indexer\Scope\StateFactory;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext as FulltextResource;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Search\Request\Config as SearchRequestConfig;
-use Magento\Framework\Search\Request\DimensionFactory;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Indexer\Dimension\DimensionProviderInterface;
+use Magento\Store\Model\StoreDimensionProvider;
 
 /**
  * Provide functionality for Fulltext Search indexing.
@@ -19,7 +17,10 @@
  * @api
  * @since 100.0.2
  */
-class Fulltext implements \Magento\Framework\Indexer\ActionInterface, \Magento\Framework\Mview\ActionInterface
+class Fulltext implements
+    \Magento\Framework\Indexer\ActionInterface,
+    \Magento\Framework\Mview\ActionInterface,
+    \Magento\Framework\Indexer\Dimension\DimensionalIndexerInterface
 {
     /**
      * Indexer ID in configuration
@@ -36,16 +37,6 @@ class Fulltext implements \Magento\Framework\Indexer\ActionInterface, \Magento\F
      */
     private $indexerHandlerFactory;
 
-    /**
-     * @var StoreManagerInterface
-     */
-    private $storeManager;
-
-    /**
-     * @var \Magento\Framework\Search\Request\DimensionFactory
-     */
-    private $dimensionFactory;
-
     /**
      * @var \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full
      */
@@ -56,11 +47,6 @@ class Fulltext implements \Magento\Framework\Indexer\ActionInterface, \Magento\F
      */
     private $fulltextResource;
 
-    /**
-     * @var \Magento\Framework\Search\Request\Config
-     */
-    private $searchRequestConfig;
-
     /**
      * @var IndexSwitcherInterface
      */
@@ -71,90 +57,97 @@ class Fulltext implements \Magento\Framework\Indexer\ActionInterface, \Magento\F
      */
     private $indexScopeState;
 
+    /**
+     * @var DimensionProviderInterface
+     */
+    private $dimensionProvider;
+
     /**
      * @param FullFactory $fullActionFactory
      * @param IndexerHandlerFactory $indexerHandlerFactory
-     * @param StoreManagerInterface $storeManager
-     * @param DimensionFactory $dimensionFactory
      * @param FulltextResource $fulltextResource
-     * @param SearchRequestConfig $searchRequestConfig
      * @param array $data
      * @param IndexSwitcherInterface $indexSwitcher
-     * @param Scope\State $indexScopeState
+     * @param StateFactory $indexScopeStateFactory
+     * @param DimensionProviderInterface $dimensionProvider
      */
     public function __construct(
         FullFactory $fullActionFactory,
         IndexerHandlerFactory $indexerHandlerFactory,
-        StoreManagerInterface $storeManager,
-        DimensionFactory $dimensionFactory,
         FulltextResource $fulltextResource,
-        SearchRequestConfig $searchRequestConfig,
-        array $data,
-        IndexSwitcherInterface $indexSwitcher = null,
-        State $indexScopeState = null
+        IndexSwitcherInterface $indexSwitcher,
+        StateFactory $indexScopeStateFactory,
+        DimensionProviderInterface $dimensionProvider,
+        array $data
     ) {
         $this->fullAction = $fullActionFactory->create(['data' => $data]);
         $this->indexerHandlerFactory = $indexerHandlerFactory;
-        $this->storeManager = $storeManager;
-        $this->dimensionFactory = $dimensionFactory;
         $this->fulltextResource = $fulltextResource;
-        $this->searchRequestConfig = $searchRequestConfig;
         $this->data = $data;
-        if (null === $indexSwitcher) {
-            $indexSwitcher = ObjectManager::getInstance()->get(IndexSwitcherInterface::class);
-        }
-        if (null === $indexScopeState) {
-            $indexScopeState = ObjectManager::getInstance()->get(State::class);
-        }
         $this->indexSwitcher = $indexSwitcher;
-        $this->indexScopeState = $indexScopeState;
+        $this->indexScopeState = $indexScopeStateFactory->create();
+        $this->dimensionProvider = $dimensionProvider;
     }
 
     /**
      * Execute materialization on ids entities
      *
-     * @param int[] $ids
+     * @param int[] $entityIds
      * @return void
+     * @throws \InvalidArgumentException
      */
-    public function execute($ids)
+    public function execute($entityIds)
     {
-        $storeIds = array_keys($this->storeManager->getStores());
-        /** @var IndexerHandler $saveHandler */
-        $saveHandler = $this->indexerHandlerFactory->create([
-            'data' => $this->data
-        ]);
-        foreach ($storeIds as $storeId) {
-            $dimension = $this->dimensionFactory->create(['name' => 'scope', 'value' => $storeId]);
-            $productIds = array_unique(array_merge($ids, $this->fulltextResource->getRelationsByChild($ids)));
-            $saveHandler->deleteIndex([$dimension], new \ArrayObject($productIds));
-            $saveHandler->saveIndex([$dimension], $this->fullAction->rebuildStoreIndex($storeId, $ids));
+        foreach ($this->dimensionProvider->getIterator() as $dimension) {
+            $this->executeByDimension($dimension, new \ArrayIterator($entityIds));
         }
     }
 
     /**
-     * Execute full indexation
-     *
-     * @return void
+     * {@inheritdoc}
+     * @throws \InvalidArgumentException
      */
-    public function executeFull()
+    public function executeByDimension(array $dimensions, \Traversable $entityIds = null)
     {
-        $storeIds = array_keys($this->storeManager->getStores());
-        /** @var IndexerHandler $saveHandler */
+        if (count($dimensions) > 1 || !isset($dimensions[StoreDimensionProvider::DIMENSION_NAME])) {
+            throw new \InvalidArgumentException('Indexer "' . self::INDEXER_ID . '" support only Store dimension');
+        }
+        $storeId = $dimensions[StoreDimensionProvider::DIMENSION_NAME]->getValue();
         $saveHandler = $this->indexerHandlerFactory->create([
             'data' => $this->data
         ]);
-        foreach ($storeIds as $storeId) {
-            $dimensions = [$this->dimensionFactory->create(['name' => 'scope', 'value' => $storeId])];
-            $this->indexScopeState->useTemporaryIndex();
 
+        if (null === $entityIds) {
+            $this->indexScopeState->useTemporaryIndex();
             $saveHandler->cleanIndex($dimensions);
             $saveHandler->saveIndex($dimensions, $this->fullAction->rebuildStoreIndex($storeId));
 
             $this->indexSwitcher->switchIndex($dimensions);
             $this->indexScopeState->useRegularIndex();
+
+            $this->fulltextResource->resetSearchResultsByStore($storeId);
+        } else {
+            // internal implementation works only with array
+            $entityIds = iterator_to_array($entityIds);
+            $productIds = array_unique(
+                array_merge($entityIds, $this->fulltextResource->getRelationsByChild($entityIds))
+            );
+            $saveHandler->deleteIndex($dimensions, new \ArrayIterator($productIds));
+            $saveHandler->saveIndex($dimensions, $this->fullAction->rebuildStoreIndex($storeId, $entityIds));
+        }
+    }
+
+    /**
+     * Execute full indexation
+     *
+     * @return void
+     * @throws \InvalidArgumentException
+     */
+    public function executeFull()
+    {
+        foreach ($this->dimensionProvider->getIterator() as $dimension) {
+            $this->executeByDimension($dimension);
         }
-        $this->fulltextResource->resetSearchResults();
-        $this->searchRequestConfig->reset();
     }
 
     /**
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
index f2768498047..fcffad31fc8 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
@@ -414,28 +414,40 @@ public function getProductAttributes($storeId, array $productIds, array $attribu
         foreach ($attributeTypes as $backendType => $attributeIds) {
             if ($attributeIds) {
                 $tableName = $this->getTable('catalog_product_entity_' . $backendType);
-                $selects[] = $this->connection->select()->from(
-                    ['t_default' => $tableName],
-                    [$linkField, 'attribute_id']
+
+                $select = $this->connection->select()->from(
+                    ['t' => $tableName],
+                    [
+                        $linkField => 't.' . $linkField,
+                        'attribute_id' => 't.attribute_id',
+                        'value' => $this->unifyField($ifStoreValue, $backendType),
+                    ]
                 )->joinLeft(
                     ['t_store' => $tableName],
                     $this->connection->quoteInto(
-                        't_default.' . $linkField . '=t_store.' . $linkField .
-                        ' AND t_default.attribute_id=t_store.attribute_id' .
+                        't.' . $linkField . '=t_store.' . $linkField .
+                        ' AND t.attribute_id=t_store.attribute_id' .
                         ' AND t_store.store_id = ?',
                         $storeId
                     ),
-                    ['value' => $this->unifyField($ifStoreValue, $backendType)]
-                )->where(
-                    't_default.store_id = ?',
-                    0
+                    []
+                )->joinLeft(
+                    ['t_default' => $tableName],
+                    $this->connection->quoteInto(
+                        't.' . $linkField . '=t_default.' . $linkField .
+                        ' AND t.attribute_id=t_default.attribute_id' .
+                        ' AND t_default.store_id = ?',
+                        0
+                    ),
+                    []
                 )->where(
-                    't_default.attribute_id IN (?)',
+                    't.attribute_id IN (?)',
                     $attributeIds
                 )->where(
-                    't_default.' . $linkField . ' IN (?)',
+                    't.' . $linkField . ' IN (?)',
                     array_keys($productLinkFieldsToEntityIdMap)
-                );
+                )->distinct();
+                $selects[] = $select;
             }
         }
 
diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php
index 15349e91c3f..7a94d75d2b4 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext.php
@@ -62,6 +62,8 @@ protected function _construct()
      * Reset search results
      *
      * @return $this
+     * @deprecated Not used anymore
+     * @see Fulltext::resetSearchResultsByStore
      */
     public function resetSearchResults()
     {
@@ -71,6 +73,25 @@ public function resetSearchResults()
         return $this;
     }
 
+    /**
+     * Reset search results by store
+     *
+     * @param int $storeId
+     * @return $this
+     */
+    public function resetSearchResultsByStore($storeId)
+    {
+        $storeId = (int) $storeId;
+        $connection = $this->getConnection();
+        $connection->update(
+            $this->getTable('search_query'),
+            ['is_processed' => 0],
+            ['is_processed != ?' => 0, 'store_id = ?' => $storeId]
+        );
+        $this->_eventManager->dispatch('catalogsearch_reset_search_result', ['store_id' => $storeId]);
+        return $this;
+    }
+
     /**
      * Retrieve product relations by children.
      *
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy.php
index 9bd26d799fd..6b5dce5fde4 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy.php
@@ -7,11 +7,9 @@
 namespace Magento\CatalogSearch\Model\Search\FilterMapper;
 
 use Magento\CatalogSearch\Model\Adapter\Mysql\Filter\AliasResolver;
+use Magento\CatalogSearch\Model\Search\FilterMapper\TermDropdownStrategy\SelectBuilder;
 use Magento\Eav\Model\Config as EavConfig;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\ResourceConnection;
-use Magento\Store\Model\ScopeInterface;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * This strategy handles attributes which comply with two criteria:
@@ -25,46 +23,37 @@ class TermDropdownStrategy implements FilterStrategyInterface
      */
     private $aliasResolver;
 
-    /**
-     * @var StoreManagerInterface
-     */
-    private $storeManager;
-
     /**
      * @var EavConfig
      */
     private $eavConfig;
 
     /**
-     * @var ResourceConnection
-     */
-    private $resourceConnection;
-
-    /**
-     * @var ScopeConfigInterface
+     * @var SelectBuilder
      */
-    private $scopeConfig;
+    private $selectBuilder;
 
     /**
-     * @param StoreManagerInterface $storeManager
-     * @param ResourceConnection $resourceConnection
+     * @param null $storeManager @deprecated
+     * @param null $resourceConnection @deprecated
      * @param EavConfig $eavConfig
-     * @param ScopeConfigInterface $scopeConfig
+     * @param null $scopeConfig @deprecated
      * @param AliasResolver $aliasResolver
-     * @SuppressWarnings(Magento.TypeDuplication)
+     * @param SelectBuilder|null $selectBuilder
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
-        StoreManagerInterface $storeManager,
-        ResourceConnection $resourceConnection,
+        $storeManager,
+        $resourceConnection,
         EavConfig $eavConfig,
-        ScopeConfigInterface $scopeConfig,
-        AliasResolver $aliasResolver
+        $scopeConfig,
+        AliasResolver $aliasResolver,
+        SelectBuilder $selectBuilder = null
     ) {
-        $this->storeManager = $storeManager;
-        $this->resourceConnection = $resourceConnection;
         $this->eavConfig = $eavConfig;
-        $this->scopeConfig = $scopeConfig;
         $this->aliasResolver = $aliasResolver;
+        $this->selectBuilder = $selectBuilder ?: ObjectManager::getInstance()->get(SelectBuilder::class);
     }
 
     /**
@@ -77,27 +66,7 @@ public function apply(
     ) {
         $alias = $this->aliasResolver->getAlias($filter);
         $attribute = $this->getAttributeByCode($filter->getField());
-        $joinCondition = sprintf(
-            'search_index.entity_id = %1$s.entity_id AND %1$s.attribute_id = %2$d AND %1$s.store_id = %3$d',
-            $alias,
-            $attribute->getId(),
-            $this->storeManager->getStore()->getId()
-        );
-        $select->joinLeft(
-            [$alias => $this->resourceConnection->getTableName('catalog_product_index_eav')],
-            $joinCondition,
-            []
-        );
-        if ($this->isAddStockFilter()) {
-            $stockAlias = $alias . AliasResolver::STOCK_FILTER_SUFFIX;
-            $select->joinLeft(
-                [
-                    $stockAlias => $this->resourceConnection->getTableName('cataloginventory_stock_status'),
-                ],
-                sprintf('%2$s.product_id = %1$s.source_id', $alias, $stockAlias),
-                []
-            );
-        }
+        $this->selectBuilder->execute((int)$attribute->getId(), $alias, $select);
 
         return true;
     }
@@ -111,17 +80,4 @@ private function getAttributeByCode($field)
     {
         return $this->eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $field);
     }
-
-    /**
-     * @return bool
-     */
-    private function isAddStockFilter()
-    {
-        $isShowOutOfStock = $this->scopeConfig->isSetFlag(
-            'cataloginventory/options/show_out_of_stock',
-            ScopeInterface::SCOPE_STORE
-        );
-
-        return false === $isShowOutOfStock;
-    }
 }
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy/ApplyStockConditionToSelect.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy/ApplyStockConditionToSelect.php
new file mode 100644
index 00000000000..1fd4a45c7e9
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy/ApplyStockConditionToSelect.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogSearch\Model\Search\FilterMapper\TermDropdownStrategy;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Select;
+
+/**
+ * Apply stock condition to select.
+ */
+class ApplyStockConditionToSelect
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection
+    ) {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * @param string $alias
+     * @param string $stockAlias
+     * @param Select $select
+     *
+     * @return void
+     */
+    public function execute(
+        string $alias,
+        string $stockAlias,
+        Select $select
+    ) {
+        $select->joinInner(
+            [$stockAlias => $this->resourceConnection->getTableName('cataloginventory_stock_status')],
+            sprintf('%2$s.product_id = %1$s.source_id', $alias, $stockAlias),
+            []
+        );
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy/SelectBuilder.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy/SelectBuilder.php
new file mode 100644
index 00000000000..fccbfa364d8
--- /dev/null
+++ b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/TermDropdownStrategy/SelectBuilder.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogSearch\Model\Search\FilterMapper\TermDropdownStrategy;
+
+use Magento\CatalogSearch\Model\Adapter\Mysql\Filter\AliasResolver;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Select;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Add joins to select.
+ */
+class SelectBuilder
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var ApplyStockConditionToSelect
+     */
+    private $applyStockConditionToSelect;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ResourceConnection $resourceConnection
+     * @param ScopeConfigInterface $scopeConfig
+     * @param StoreManagerInterface $storeManager
+     * @param ApplyStockConditionToSelect $applyStockConditionToSelect
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        ScopeConfigInterface $scopeConfig,
+        StoreManagerInterface $storeManager,
+        ApplyStockConditionToSelect $applyStockConditionToSelect
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->scopeConfig = $scopeConfig;
+        $this->storeManager = $storeManager;
+        $this->applyStockConditionToSelect = $applyStockConditionToSelect;
+    }
+
+    /**
+     * @param int $attributeId
+     * @param string $alias
+     * @param Select $select
+     */
+    public function execute(
+        int $attributeId,
+        string $alias,
+        Select $select
+    ) {
+        $joinCondition = sprintf(
+            'search_index.entity_id = %1$s.entity_id AND %1$s.attribute_id = %2$d AND %1$s.store_id = %3$d',
+            $alias,
+            $attributeId,
+            $this->storeManager->getStore()->getId()
+        );
+        $select->joinLeft(
+            [$alias => $this->resourceConnection->getTableName('catalog_product_index_eav')],
+            $joinCondition,
+            []
+        );
+        if ($this->isAddStockFilter()) {
+            $stockAlias = $alias . AliasResolver::STOCK_FILTER_SUFFIX;
+            $this->applyStockConditionToSelect->execute($alias, $stockAlias, $select);
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    private function isAddStockFilter()
+    {
+        $isShowOutOfStock = $this->scopeConfig->isSetFlag(
+            'cataloginventory/options/show_out_of_stock',
+            ScopeInterface::SCOPE_STORE
+        );
+
+        return false === $isShowOutOfStock;
+    }
+}
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProviderTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProviderTest.php
index 7c558f60b74..8eeceba8209 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProviderTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Mysql/Aggregation/DataProviderTest.php
@@ -7,7 +7,7 @@
 namespace Magento\CatalogSearch\Test\Unit\Model\Adapter\Mysql\Aggregation;
 
 use Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider;
-use Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider\QueryBuilder;
+use Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider\SelectBuilderForAttribute;
 use Magento\Eav\Model\Config;
 use Magento\Customer\Model\Session;
 use Magento\Framework\App\ResourceConnection;
@@ -22,8 +22,6 @@
 use Magento\Framework\DB\Ddl\Table;
 
 /**
- * Test for Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider.
- *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DataProviderTest extends \PHPUnit\Framework\TestCase
@@ -59,9 +57,9 @@ class DataProviderTest extends \PHPUnit\Framework\TestCase
     private $adapterMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject|SelectBuilderForAttribute
      */
-    private $queryBuilderMock;
+    private $selectBuilderForAttribute;
 
     protected function setUp()
     {
@@ -71,53 +69,64 @@ protected function setUp()
         $this->sessionMock = $this->createMock(Session::class);
         $this->adapterMock = $this->createMock(AdapterInterface::class);
         $this->resourceConnectionMock->expects($this->once())->method('getConnection')->willReturn($this->adapterMock);
-        $this->queryBuilderMock = $this->createMock(QueryBuilder::class);
-
+        $this->selectBuilderForAttribute = $this->createMock(SelectBuilderForAttribute::class);
         $this->model = new DataProvider(
             $this->eavConfigMock,
             $this->resourceConnectionMock,
             $this->scopeResolverMock,
             $this->sessionMock,
-            $this->queryBuilderMock
+            $this->selectBuilderForAttribute
         );
     }
 
-    public function testGetDataSet()
+    public function testGetDataSetUsesFrontendPriceIndexerTableIfAttributeIsPrice()
     {
         $storeId = 1;
-        $attributeCode = 'my_decimal';
+        $attributeCode = 'price';
 
         $scopeMock = $this->createMock(Store::class);
-        $scopeMock->expects($this->any())->method('getId')->willReturn($storeId);
-
+        $scopeMock->expects($this->atLeastOnce())->method('getId')->willReturn($storeId);
         $dimensionMock = $this->createMock(Dimension::class);
-        $dimensionMock->expects($this->any())->method('getValue')->willReturn($storeId);
-
+        $dimensionMock->expects($this->atLeastOnce())->method('getValue')->willReturn($storeId);
         $this->scopeResolverMock->expects($this->any())->method('getScope')->with($storeId)->willReturn($scopeMock);
 
         $bucketMock = $this->createMock(BucketInterface::class);
         $bucketMock->expects($this->once())->method('getField')->willReturn($attributeCode);
-
         $attributeMock = $this->createMock(Attribute::class);
-        $this->eavConfigMock->expects($this->once())->method('getAttribute')
-            ->with(Product::ENTITY, $attributeCode)->willReturn($attributeMock);
+        $this->eavConfigMock->expects($this->once())
+            ->method('getAttribute')->with(Product::ENTITY, $attributeCode)
+            ->willReturn($attributeMock);
 
+        $selectMock = $this->createMock(Select::class);
+        $this->adapterMock->expects($this->atLeastOnce())->method('select')->willReturn($selectMock);
         $tableMock = $this->createMock(Table::class);
-        $tableMock->expects($this->once())->method('getName')->willReturn('test');
-
-        $this->sessionMock->expects($this->once())->method('getCustomerGroupId')->willReturn(1);
-
-        $this->queryBuilderMock->expects($this->once())->method('build')
-            ->with($attributeMock, 'test', $storeId, 1);
 
         $this->model->getDataSet($bucketMock, ['scope' => $dimensionMock], $tableMock);
     }
 
-    public function testExecute()
+    public function testGetDataSetUsesFrontendPriceIndexerTableForDecimalAttributes()
     {
-        $selectMock = $this->createMock(Select::class);
-        $this->adapterMock->expects($this->once())->method('fetchAssoc')->with($selectMock);
+        $storeId = 1;
+        $attributeCode = 'my_decimal';
+
+        $scopeMock = $this->createMock(Store::class);
+        $scopeMock->expects($this->atLeastOnce())->method('getId')->willReturn($storeId);
+        $dimensionMock = $this->createMock(Dimension::class);
+        $dimensionMock->expects($this->atLeastOnce())->method('getValue')->willReturn($storeId);
+        $this->scopeResolverMock->expects($this->atLeastOnce())->method('getScope')->with($storeId)
+            ->willReturn($scopeMock);
 
-        $this->model->execute($selectMock);
+        $bucketMock = $this->createMock(BucketInterface::class);
+        $bucketMock->expects($this->once())->method('getField')->willReturn($attributeCode);
+        $attributeMock = $this->createMock(Attribute::class);
+        $this->eavConfigMock->expects($this->once())
+            ->method('getAttribute')->with(Product::ENTITY, $attributeCode)
+            ->willReturn($attributeMock);
+
+        $selectMock = $this->createMock(Select::class);
+        $this->selectBuilderForAttribute->expects($this->once())->method('build')->willReturn($selectMock);
+        $this->adapterMock->expects($this->atLeastOnce())->method('select')->willReturn($selectMock);
+        $tableMock = $this->createMock(Table::class);
+        $this->model->getDataSet($bucketMock, ['scope' => $dimensionMock], $tableMock);
     }
 }
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php
index 60d4ef5f55f..f2cacd74fdd 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php
@@ -5,8 +5,8 @@
  */
 namespace Magento\CatalogSearch\Test\Unit\Model\Indexer;
 
-use Magento\Framework\Search\Request\Dimension;
-use Magento\Framework\Search\Request\DimensionFactory;
+use \Magento\Framework\Indexer\Dimension;
+use Magento\Framework\Indexer\Dimension\DimensionProviderInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**
@@ -24,11 +24,6 @@ class FulltextTest extends \PHPUnit\Framework\TestCase
      */
     protected $fullAction;
 
-    /**
-     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $storeManager;
-
     /**
      * @var \Magento\CatalogSearch\Model\Indexer\IndexerHandler|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -40,19 +35,14 @@ class FulltextTest extends \PHPUnit\Framework\TestCase
     protected $fulltextResource;
 
     /**
-     * @var \Magento\Framework\Search\Request\Config|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $searchRequestConfig;
-
-    /**
-     * @var \Magento\Framework\Search\Request\DimensionFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\CatalogSearch\Model\Indexer\Scope\IndexSwitcher|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $dimensionFactory;
+    private $indexSwitcher;
 
     /**
-     * @var \Magento\CatalogSearch\Model\Indexer\Scope\IndexSwitcher|\PHPUnit_Framework_MockObject_MockObject
+     * @var DimensionProviderInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $indexSwitcher;
+    private $dimensionProviderMock;
 
     protected function setUp()
     {
@@ -69,38 +59,27 @@ protected function setUp()
         );
         $indexerHandlerFactory->expects($this->any())->method('create')->willReturn($this->saveHandler);
 
-        $this->storeManager = $this->getMockForAbstractClass(
-            \Magento\Store\Model\StoreManagerInterface::class,
-            [],
-            '',
-            false,
-            false,
-            true,
-            []
-        );
-
-        $this->dimensionFactory = $this->createPartialMock(DimensionFactory::class, ['create']);
-
         $this->fulltextResource = $this->getClassMock(\Magento\CatalogSearch\Model\ResourceModel\Fulltext::class);
-        $this->searchRequestConfig = $this->getClassMock(\Magento\Framework\Search\Request\Config::class);
 
         $this->indexSwitcher = $this->getMockBuilder(\Magento\CatalogSearch\Model\Indexer\Scope\IndexSwitcher::class)
             ->disableOriginalConstructor()
             ->setMethods(['switchIndex'])
             ->getMock();
 
+        $this->dimensionProviderMock = $this->getMockBuilder(DimensionProviderInterface::class)->getMock();
+        $stateMock = $this->getMockBuilder(\Magento\CatalogSearch\Model\Indexer\Scope\State::class)
+            ->getMock();
         $objectManagerHelper = new ObjectManagerHelper($this);
         $this->model = $objectManagerHelper->getObject(
             \Magento\CatalogSearch\Model\Indexer\Fulltext::class,
             [
                 'fullActionFactory' => $fullActionFactory,
                 'indexerHandlerFactory' => $indexerHandlerFactory,
-                'storeManager' => $this->storeManager,
-                'dimensionFactory' => $this->dimensionFactory,
                 'fulltextResource' => $this->fulltextResource,
-                'searchRequestConfig' => $this->searchRequestConfig,
                 'data' => [],
                 'indexSwitcher' => $this->indexSwitcher,
+                'dimensionProvider' => $this->dimensionProviderMock,
+                'indexScopeState' => $stateMock,
             ]
         );
     }
@@ -118,61 +97,66 @@ public function testExecute()
     {
         $ids = [1, 2, 3];
         $stores = [0 => 'Store 1', 1 => 'Store 2'];
+        $this->setupDataProvider($stores);
+
         $indexData = new \ArrayObject([]);
         $this->fulltextResource->expects($this->exactly(2))
             ->method('getRelationsByChild')
             ->willReturn($ids);
-        $this->storeManager->expects($this->once())->method('getStores')->willReturn($stores);
         $this->saveHandler->expects($this->exactly(count($stores)))->method('deleteIndex');
         $this->saveHandler->expects($this->exactly(2))->method('saveIndex');
+        $consecutiveStoreRebuildArguments = array_map(
+            function ($store) use ($ids) {
+                return [$store, $ids];
+            },
+            $stores
+        );
         $this->fullAction->expects($this->exactly(2))
             ->method('rebuildStoreIndex')
+            ->withConsecutive(...$consecutiveStoreRebuildArguments)
             ->willReturn(new \ArrayObject([$indexData, $indexData]));
 
         $this->model->execute($ids);
     }
 
+    private function setupDataProvider($stores)
+    {
+        $this->dimensionProviderMock->expects($this->once())->method('getIterator')->willReturn(
+            (function () use ($stores) {
+                foreach ($stores as $storeId) {
+                    $dimension = $this->getMockBuilder(Dimension::class)->disableOriginalConstructor()->getMock();
+                    $dimension->expects($this->once())
+                        ->method('getValue')
+                        ->willReturn($storeId);
+
+                    yield ['scope' => $dimension];
+                }
+            })()
+        );
+    }
+
     public function testExecuteFull()
     {
         $stores = [0 => 'Store 1', 1 => 'Store 2'];
         $indexData = new \ArrayObject([new \ArrayObject([]), new \ArrayObject([])]);
-        $this->storeManager->expects($this->once())->method('getStores')->willReturn($stores);
+        $this->setupDataProvider($stores);
 
-        $dimensionScope1 = $this->getMockBuilder(Dimension::class)
-            ->setConstructorArgs(['scope', '1'])
-            ->getMock();
-        $dimensionScope2 = $this->getMockBuilder(Dimension::class)
-            ->setConstructorArgs(['scope', '2'])
-            ->getMock();
+        $this->indexSwitcher->expects($this->exactly(2))->method('switchIndex');
 
-        $this->dimensionFactory->expects($this->any())->method('create')->willReturnOnConsecutiveCalls(
-            $dimensionScope1,
-            $dimensionScope2
+        $this->saveHandler->expects($this->exactly(count($stores)))->method('cleanIndex');
+        $this->saveHandler->expects($this->exactly(2))->method('saveIndex');
+        $consecutiveStoreRebuildArguments = array_map(
+            function ($store) {
+                return [$store];
+            },
+            $stores
         );
-        $this->indexSwitcher->expects($this->exactly(2))->method('switchIndex')
-            ->withConsecutive(
-                [$this->equalTo([$dimensionScope1])],
-                [$this->equalTo([$dimensionScope2])]
-            );
-
-        $this->saveHandler->expects($this->exactly(count($stores)))->method('cleanIndex')
-            ->withConsecutive(
-                [$this->equalTo([$dimensionScope1])],
-                [$this->equalTo([$dimensionScope2])]
-            );
-
-        $this->saveHandler->expects($this->exactly(2))->method('saveIndex')
-            ->withConsecutive(
-                [$this->equalTo([$dimensionScope1]), $this->equalTo($indexData)],
-                [$this->equalTo([$dimensionScope2]), $this->equalTo($indexData)]
-            );
         $this->fullAction->expects($this->exactly(2))
             ->method('rebuildStoreIndex')
-            ->withConsecutive([0], [1])
+            ->withConsecutive(...$consecutiveStoreRebuildArguments)
             ->willReturn($indexData);
 
-        $this->fulltextResource->expects($this->once())->method('resetSearchResults');
-        $this->searchRequestConfig->expects($this->once())->method('reset');
+        $this->fulltextResource->expects($this->exactly(2))->method('resetSearchResultsByStore');
 
         $this->model->executeFull();
     }
@@ -181,11 +165,11 @@ public function testExecuteList()
     {
         $ids = [1, 2, 3];
         $stores = [0 => 'Store 1', 1 => 'Store 2'];
+        $this->setupDataProvider($stores);
         $indexData = new \ArrayObject([]);
         $this->fulltextResource->expects($this->exactly(2))
             ->method('getRelationsByChild')
             ->willReturn($ids);
-        $this->storeManager->expects($this->once())->method('getStores')->willReturn($stores);
         $this->saveHandler->expects($this->exactly(count($stores)))->method('deleteIndex');
         $this->saveHandler->expects($this->exactly(2))->method('saveIndex');
         $this->fullAction->expects($this->exactly(2))
@@ -199,11 +183,11 @@ public function testExecuteRow()
     {
         $id = 1;
         $stores = [0 => 'Store 1', 1 => 'Store 2'];
+        $this->setupDataProvider($stores);
         $indexData = new \ArrayObject([]);
         $this->fulltextResource->expects($this->exactly(2))
             ->method('getRelationsByChild')
             ->willReturn([$id]);
-        $this->storeManager->expects($this->once())->method('getStores')->willReturn($stores);
         $this->saveHandler->expects($this->exactly(count($stores)))->method('deleteIndex');
         $this->saveHandler->expects($this->exactly(2))->method('saveIndex');
         $this->fullAction->expects($this->exactly(2))
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/FulltextTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/FulltextTest.php
index a49770a40f6..f30733fb082 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/FulltextTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/FulltextTest.php
@@ -74,7 +74,7 @@ protected function setUp()
         );
     }
 
-    public function testResetSearchResult()
+    public function testResetSearchResultByStore()
     {
         $this->resource->expects($this->once())
             ->method('getTableName')
@@ -82,9 +82,9 @@ public function testResetSearchResult()
             ->willReturn('table_name_search_query');
         $this->connection->expects($this->once())
             ->method('update')
-            ->with('table_name_search_query', ['is_processed' => 0], ['is_processed != 0'])
+            ->with('table_name_search_query', ['is_processed' => 0], ['is_processed != ?' => 0, 'store_id = ?' => 1])
             ->willReturn(10);
-        $result = $this->target->resetSearchResults();
+        $result = $this->target->resetSearchResultsByStore(1);
         $this->assertEquals($this->target, $result);
     }
 
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/TermDropdownStrategyTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/TermDropdownStrategyTest.php
index af13f96f78d..8771c92039f 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/TermDropdownStrategyTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/FilterMapper/TermDropdownStrategyTest.php
@@ -6,14 +6,14 @@
 
 namespace Magento\CatalogSearch\Test\Unit\Model\Search\FilterMapper;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Framework\Search\Request\FilterInterface;
-use Magento\Store\Model\StoreManagerInterface;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Api\Data\StoreInterface;
-use Magento\Framework\DB\Select;
-use Magento\Eav\Model\Config as EavConfig;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\CatalogSearch\Model\Adapter\Mysql\Filter\AliasResolver;
+use Magento\CatalogSearch\Model\Search\FilterMapper\TermDropdownStrategy;
+use Magento\CatalogSearch\Model\Search\FilterMapper\TermDropdownStrategy\SelectBuilder;
+use Magento\Eav\Model\Config as EavConfig;
+use Magento\Framework\DB\Select;
+use Magento\Framework\Search\Request\FilterInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 /**
  * Class TermDropdownStrategyTest.
@@ -27,90 +27,54 @@ class TermDropdownStrategyTest extends \PHPUnit\Framework\TestCase
     private $eavConfig;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $storeManager;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var TermDropdownStrategy
      */
-    private $scopeConfig;
+    private $termDropdownStrategy;
 
     /**
-     * @var \Magento\CatalogSearch\Model\Search\FilterMapper\TermDropdownStrategy
+     * @var AliasResolver|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $model;
+    private $aliasResolver;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * SelectBuilder|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $resourceMock;
+    private $selectBuilder;
 
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
-        $this->eavConfig = $this->getMockBuilder(EavConfig::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resourceMock = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->model = $objectManager->getObject(
-            \Magento\CatalogSearch\Model\Search\FilterMapper\TermDropdownStrategy::class,
+        $this->eavConfig = $this->createMock(EavConfig::class);
+        $this->aliasResolver = $this->createMock(AliasResolver::class);
+        $this->selectBuilder = $this->createMock(SelectBuilder::class);
+        $this->termDropdownStrategy = $objectManager->getObject(
+            TermDropdownStrategy::class,
             [
-                'storeManager' => $this->storeManager,
-                'scopeConfig' => $this->scopeConfig,
                 'eavConfig' => $this->eavConfig,
-                'resourceConnection' => $this->resourceMock
+                'aliasResolver' => $this->aliasResolver,
+                'selectBuilder' => $this->selectBuilder
             ]
         );
     }
 
     public function testApply()
     {
-        $searchFilter = $this->getMockBuilder(FilterInterface::class)
-            ->setMethods(['getField', 'getType', 'getName'])
-            ->getMock();
-        $select = $this->getMockBuilder(Select::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $attribute = $this->getMockBuilder(Attribute::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $store = $this->getMockBuilder(StoreInterface::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $attributeId = 5;
+        $alias = 'some_alias';
+        $this->aliasResolver->expects($this->once())->method('getAlias')->willReturn($alias);
+        $searchFilter = $this->createPartialMock(
+            FilterInterface::class,
+            ['getField', 'getType', 'getName']
+        );
+
+        $select = $this->createMock(Select::class);
+        $attribute = $this->createMock(Attribute::class);
 
-        $this->resourceMock->expects($this->any())
-            ->method('getTableName')
-            ->willReturn('cataloginventory_stock_status');
-        $this->scopeConfig->expects($this->once())
-            ->method('isSetFlag')
-            ->willReturn(false);
-        $this->eavConfig->expects($this->once())
-            ->method('getAttribute')
-            ->willReturn($attribute);
-        $this->storeManager->expects($this->once())
-            ->method('getStore')
-            ->willReturn($store);
-        $store->expects($this->once())
-            ->method('getId')
-            ->willReturn(1);
-        $attribute->expects($this->once())
-            ->method('getId')
-            ->willReturn(1);
-        $searchFilter->expects($this->once())
-            ->method('getField')
-            ->willReturn('filed');
+        $this->eavConfig->expects($this->once())->method('getAttribute')->willReturn($attribute);
+        $attribute->expects($this->once())->method('getId')->willReturn($attributeId);
+        $searchFilter->expects($this->once())->method('getField');
+        $this->selectBuilder->expects($this->once())->method('execute')->with($attributeId, $alias, $select);
 
-        $this->assertTrue($this->model->apply($searchFilter, $select));
+        $this->assertTrue($this->termDropdownStrategy->apply($searchFilter, $select));
     }
 }
diff --git a/app/code/Magento/CatalogSearch/etc/di.xml b/app/code/Magento/CatalogSearch/etc/di.xml
index c4705252300..3d1c4470b1a 100644
--- a/app/code/Magento/CatalogSearch/etc/di.xml
+++ b/app/code/Magento/CatalogSearch/etc/di.xml
@@ -211,6 +211,8 @@
     <type name="Magento\CatalogSearch\Model\Adapter\Mysql\Aggregation\DataProvider">
         <arguments>
             <argument name="range" xsi:type="object">Magento\Catalog\Model\Layer\Filter\Price\Range\Proxy</argument>
+            <!-- @deprecated parameter customerSession has been deprecated and not in used now -->
+            <argument name="customerSession" xsi:type="null"/>
         </arguments>
         <plugin name="categoryIdAggregation" type="Magento\CatalogSearch\Model\Adapter\Mysql\Plugin\Aggregation\Category\DataProvider" />
     </type>
@@ -297,4 +299,21 @@
             <argument name="name" xsi:type="string">catalog_view_container</argument>
         </arguments>
     </type>
+    <type name="Magento\CatalogSearch\Model\Search\FilterMapper\TermDropdownStrategy">
+        <arguments>
+            <!-- @deprecated parameter storeManager has been deprecated and not in used now -->
+            <argument name="storeManager" xsi:type="null"/>
+            <!-- @deprecated parameter resourceConnection has been deprecated and not in used now -->
+            <argument name="resourceConnection" xsi:type="null"/>
+            <!-- @deprecated parameter scopeConfig has been deprecated and not in used now -->
+            <argument name="scopeConfig" xsi:type="null"/>
+        </arguments>
+    </type>
+    <type name="Magento\CatalogSearch\Model\Indexer\Fulltext">
+        <arguments>
+            <argument name="dimensionProvider" xsi:type="object" shared="false">
+                Magento\Store\Model\StoreDimensionProvider
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Storage/DbStorage.php b/app/code/Magento/CatalogUrlRewrite/Model/Storage/DbStorage.php
index 748589924d9..f0351467e5f 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Storage/DbStorage.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Storage/DbStorage.php
@@ -12,25 +12,37 @@
 class DbStorage extends BaseDbStorage
 {
     /**
-     * @param array $data
-     * @return \Magento\Framework\DB\Select
+     * {@inheritDoc}
      */
     protected function prepareSelect(array $data)
     {
+        $metadata = [];
+        if (array_key_exists(UrlRewrite::METADATA, $data)) {
+            $metadata = $data[UrlRewrite::METADATA];
+            unset($data[UrlRewrite::METADATA]);
+        }
+
         $select = $this->connection->select();
-        $select->from(['url_rewrite' => $this->resource->getTableName('url_rewrite')])
-            ->joinLeft(
-                ['relation' => $this->resource->getTableName(Product::TABLE_NAME)],
-                'url_rewrite.url_rewrite_id = relation.url_rewrite_id'
-            )
-            ->where('url_rewrite.entity_id IN (?)', $data['entity_id'])
-            ->where('url_rewrite.entity_type = ?', $data['entity_type'])
-            ->where('url_rewrite.store_id IN (?)', $data['store_id']);
-        if (empty($data[UrlRewrite::METADATA]['category_id'])) {
+        $select->from([
+            'url_rewrite' => $this->resource->getTableName(self::TABLE_NAME)
+        ]);
+        $select->joinLeft(
+            ['relation' => $this->resource->getTableName(Product::TABLE_NAME)],
+            'url_rewrite.url_rewrite_id = relation.url_rewrite_id'
+        );
+
+        foreach ($data as $column => $value) {
+            $select->where('url_rewrite.' . $column . ' IN (?)', $value);
+        }
+        if (empty($metadata['category_id'])) {
             $select->where('relation.category_id IS NULL');
         } else {
-            $select->where('relation.category_id = ?', $data[UrlRewrite::METADATA]['category_id']);
+            $select->where(
+                'relation.category_id = ?',
+                $metadata['category_id']
+            );
         }
+
         return $select;
     }
 }
diff --git a/app/code/Magento/Checkout/Block/Cart/ValidationMessages.php b/app/code/Magento/Checkout/Block/Cart/ValidationMessages.php
index 2cc07f49b6d..0ec2982b83c 100644
--- a/app/code/Magento/Checkout/Block/Cart/ValidationMessages.php
+++ b/app/code/Magento/Checkout/Block/Cart/ValidationMessages.php
@@ -84,7 +84,7 @@ protected function _prepareLayout()
     protected function validateMinimumAmount()
     {
         if (!$this->cartHelper->getQuote()->validateMinimumAmount()) {
-            $this->messageManager->addNotice($this->getMinimumAmountErrorMessage()->getMessage());
+            $this->messageManager->addNoticeMessage($this->getMinimumAmountErrorMessage()->getMessage());
         }
     }
 
diff --git a/app/code/Magento/Checkout/Controller/Action.php b/app/code/Magento/Checkout/Controller/Action.php
index d985a7cd53c..7ec5336001c 100644
--- a/app/code/Magento/Checkout/Controller/Action.php
+++ b/app/code/Magento/Checkout/Controller/Action.php
@@ -70,7 +70,7 @@ protected function _preDispatchValidateCustomer($redirect = true, $addErrors = t
             if (!$validationResult->isValid()) {
                 if ($addErrors) {
                     foreach ($validationResult->getMessages() as $error) {
-                        $this->messageManager->addError($error);
+                        $this->messageManager->addErrorMessage($error);
                     }
                 }
                 if ($redirect) {
diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php
index 8831b92f3ec..92dd8dd8f25 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Add.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Add.php
@@ -132,13 +132,13 @@ public function execute()
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             if ($this->_checkoutSession->getUseNotice(true)) {
-                $this->messageManager->addNotice(
+                $this->messageManager->addNoticeMessage(
                     $this->_objectManager->get(\Magento\Framework\Escaper::class)->escapeHtml($e->getMessage())
                 );
             } else {
                 $messages = array_unique(explode("\n", $e->getMessage()));
                 foreach ($messages as $message) {
-                    $this->messageManager->addError(
+                    $this->messageManager->addErrorMessage(
                         $this->_objectManager->get(\Magento\Framework\Escaper::class)->escapeHtml($message)
                     );
                 }
@@ -153,7 +153,10 @@ public function execute()
 
             return $this->goBack($url);
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('We can\'t add this item to your shopping cart right now.'));
+            $this->messageManager->addExceptionMessage(
+                $e,
+                __('We can\'t add this item to your shopping cart right now.')
+            );
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
             return $this->goBack();
         }
diff --git a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
index fba1b85caf7..c205f3c1607 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
@@ -60,12 +60,12 @@ public function execute()
                     $this->addOrderItem($item);
                 } catch (\Magento\Framework\Exception\LocalizedException $e) {
                     if ($this->_checkoutSession->getUseNotice(true)) {
-                        $this->messageManager->addNotice($e->getMessage());
+                        $this->messageManager->addNoticeMessage($e->getMessage());
                     } else {
-                        $this->messageManager->addError($e->getMessage());
+                        $this->messageManager->addErrorMessage($e->getMessage());
                     }
                 } catch (\Exception $e) {
-                    $this->messageManager->addException(
+                    $this->messageManager->addExceptionMessage(
                         $e,
                         __('We can\'t add this item to your shopping cart right now.')
                     );
diff --git a/app/code/Magento/Checkout/Controller/Cart/Configure.php b/app/code/Magento/Checkout/Controller/Cart/Configure.php
index 6d409144ff6..19b2d2db345 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Configure.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Configure.php
@@ -64,7 +64,9 @@ public function execute()
 
         try {
             if (!$quoteItem || $productId != $quoteItem->getProduct()->getId()) {
-                $this->messageManager->addError(__("The quote item isn't found. Verify the item and try again."));
+                $this->messageManager->addErrorMessage(
+                    __("The quote item isn't found. Verify the item and try again.")
+                );
                 return $this->resultFactory->create(ResultFactory::TYPE_REDIRECT)->setPath('checkout/cart');
             }
 
@@ -83,7 +85,7 @@ public function execute()
                 );
             return $resultPage;
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('We cannot configure the product.'));
+            $this->messageManager->addErrorMessage(__('We cannot configure the product.'));
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
             return $this->_goBack();
         }
diff --git a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
index 56215814d2c..5f683351811 100644
--- a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
@@ -95,14 +95,14 @@ public function execute()
                 if (!$itemsCount) {
                     if ($isCodeLengthValid && $coupon->getId()) {
                         $this->_checkoutSession->getQuote()->setCouponCode($couponCode)->save();
-                        $this->messageManager->addSuccess(
+                        $this->messageManager->addSuccessMessage(
                             __(
                                 'You used coupon code "%1".',
                                 $escaper->escapeHtml($couponCode)
                             )
                         );
                     } else {
-                        $this->messageManager->addError(
+                        $this->messageManager->addErrorMessage(
                             __(
                                 'The coupon code "%1" is not valid.',
                                 $escaper->escapeHtml($couponCode)
@@ -111,14 +111,14 @@ public function execute()
                     }
                 } else {
                     if ($isCodeLengthValid && $coupon->getId() && $couponCode == $cartQuote->getCouponCode()) {
-                        $this->messageManager->addSuccess(
+                        $this->messageManager->addSuccessMessage(
                             __(
                                 'You used coupon code "%1".',
                                 $escaper->escapeHtml($couponCode)
                             )
                         );
                     } else {
-                        $this->messageManager->addError(
+                        $this->messageManager->addErrorMessage(
                             __(
                                 'The coupon code "%1" is not valid.',
                                 $escaper->escapeHtml($couponCode)
@@ -127,12 +127,12 @@ public function execute()
                     }
                 }
             } else {
-                $this->messageManager->addSuccess(__('You canceled the coupon code.'));
+                $this->messageManager->addSuccessMessage(__('You canceled the coupon code.'));
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('We cannot apply the coupon code.'));
+            $this->messageManager->addErrorMessage(__('We cannot apply the coupon code.'));
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
         }
 
diff --git a/app/code/Magento/Checkout/Controller/Cart/Delete.php b/app/code/Magento/Checkout/Controller/Cart/Delete.php
index 5687e0cad07..4a6174e83fd 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Delete.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Delete.php
@@ -24,7 +24,7 @@ public function execute()
             try {
                 $this->cart->removeItem($id)->save();
             } catch (\Exception $e) {
-                $this->messageManager->addError(__('We can\'t remove the item.'));
+                $this->messageManager->addErrorMessage(__('We can\'t remove the item.'));
                 $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
             }
         }
diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
index d7cb94f3da6..59bd6489bf9 100644
--- a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
+++ b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
@@ -67,17 +67,17 @@ public function execute()
                         $this->_objectManager->get(\Magento\Framework\Escaper::class)
                             ->escapeHtml($item->getProduct()->getName())
                     );
-                    $this->messageManager->addSuccess($message);
+                    $this->messageManager->addSuccessMessage($message);
                 }
                 return $this->_goBack($this->_url->getUrl('checkout/cart'));
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             if ($this->_checkoutSession->getUseNotice(true)) {
-                $this->messageManager->addNotice($e->getMessage());
+                $this->messageManager->addNoticeMessage($e->getMessage());
             } else {
                 $messages = array_unique(explode("\n", $e->getMessage()));
                 foreach ($messages as $message) {
-                    $this->messageManager->addError($message);
+                    $this->messageManager->addErrorMessage($message);
                 }
             }
 
@@ -89,7 +89,7 @@ public function execute()
                 return $this->resultRedirectFactory->create()->setUrl($this->_redirect->getRedirectUrl($cartUrl));
             }
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('We can\'t update the item right now.'));
+            $this->messageManager->addExceptionMessage($e, __('We can\'t update the item right now.'));
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
             return $this->_goBack();
         }
diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
index 09fa1bd64f8..174cb38b0e9 100644
--- a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
@@ -18,9 +18,9 @@ protected function _emptyShoppingCart()
         try {
             $this->cart->truncate()->save();
         } catch (\Magento\Framework\Exception\LocalizedException $exception) {
-            $this->messageManager->addError($exception->getMessage());
+            $this->messageManager->addErrorMessage($exception->getMessage());
         } catch (\Exception $exception) {
-            $this->messageManager->addException($exception, __('We can\'t update the shopping cart.'));
+            $this->messageManager->addExceptionMessage($exception, __('We can\'t update the shopping cart.'));
         }
     }
 
@@ -52,11 +52,11 @@ protected function _updateShoppingCart()
                 $this->cart->updateItems($cartData)->save();
             }
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError(
+            $this->messageManager->addErrorMessage(
                 $this->_objectManager->get(\Magento\Framework\Escaper::class)->escapeHtml($e->getMessage())
             );
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('We can\'t update the shopping cart.'));
+            $this->messageManager->addExceptionMessage($e, __('We can\'t update the shopping cart.'));
             $this->_objectManager->get(\Psr\Log\LoggerInterface::class)->critical($e);
         }
     }
diff --git a/app/code/Magento/Checkout/Controller/Index/Index.php b/app/code/Magento/Checkout/Controller/Index/Index.php
index 0a5b7f190e3..56575fb6c06 100644
--- a/app/code/Magento/Checkout/Controller/Index/Index.php
+++ b/app/code/Magento/Checkout/Controller/Index/Index.php
@@ -18,7 +18,7 @@ public function execute()
         /** @var \Magento\Checkout\Helper\Data $checkoutHelper */
         $checkoutHelper = $this->_objectManager->get(\Magento\Checkout\Helper\Data::class);
         if (!$checkoutHelper->canOnepageCheckout()) {
-            $this->messageManager->addError(__('One-page checkout is turned off.'));
+            $this->messageManager->addErrorMessage(__('One-page checkout is turned off.'));
             return $this->resultRedirectFactory->create()->setPath('checkout/cart');
         }
 
@@ -28,7 +28,7 @@ public function execute()
         }
 
         if (!$this->_customerSession->isLoggedIn() && !$checkoutHelper->isAllowedGuestCheckout($quote)) {
-            $this->messageManager->addError(__('Guest checkout is disabled.'));
+            $this->messageManager->addErrorMessage(__('Guest checkout is disabled.'));
             return $this->resultRedirectFactory->create()->setPath('checkout/cart');
         }
 
diff --git a/app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php b/app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php
index e9a968681bf..0208519c33d 100644
--- a/app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php
+++ b/app/code/Magento/Checkout/Controller/Sidebar/UpdateItemQty.php
@@ -55,7 +55,7 @@ public function __construct(
     public function execute()
     {
         $itemId = (int)$this->getRequest()->getParam('item_id');
-        $itemQty = (int)$this->getRequest()->getParam('item_qty');
+        $itemQty = $this->getRequest()->getParam('item_qty') * 1;
 
         try {
             $this->sidebar->checkQuoteItem($itemId);
diff --git a/app/code/Magento/Checkout/Model/Cart.php b/app/code/Magento/Checkout/Model/Cart.php
index d1a55aee4db..a18cba3f67c 100644
--- a/app/code/Magento/Checkout/Model/Cart.php
+++ b/app/code/Magento/Checkout/Model/Cart.php
@@ -445,10 +445,10 @@ public function addProductsByIds($productIds)
             }
 
             if (!$allAvailable) {
-                $this->messageManager->addError(__("We don't have some of the products you want."));
+                $this->messageManager->addErrorMessage(__("We don't have some of the products you want."));
             }
             if (!$allAdded) {
-                $this->messageManager->addError(__("We don't have as many of some products as you want."));
+                $this->messageManager->addErrorMessage(__("We don't have as many of some products as you want."));
             }
         }
         return $this;
@@ -534,7 +534,7 @@ public function updateItems($data)
 
                 if (isset($itemInfo['before_suggest_qty']) && $itemInfo['before_suggest_qty'] != $qty) {
                     $qtyRecalculatedFlag = true;
-                    $this->messageManager->addNotice(
+                    $this->messageManager->addNoticeMessage(
                         __('Quantity was recalculated from %1 to %2', $itemInfo['before_suggest_qty'], $qty),
                         'quote_item' . $item->getId()
                     );
@@ -543,7 +543,7 @@ public function updateItems($data)
         }
 
         if ($qtyRecalculatedFlag) {
-            $this->messageManager->addNotice(
+            $this->messageManager->addNoticeMessage(
                 __('We adjusted product quantities to fit the required increments.')
             );
         }
diff --git a/app/code/Magento/Checkout/Model/Type/Onepage.php b/app/code/Magento/Checkout/Model/Type/Onepage.php
index bc6eb07b51a..f7e55fdc84c 100644
--- a/app/code/Magento/Checkout/Model/Type/Onepage.php
+++ b/app/code/Magento/Checkout/Model/Type/Onepage.php
@@ -666,7 +666,7 @@ protected function _involveNewCustomer()
         $confirmationStatus = $this->accountManagement->getConfirmationStatus($customer->getId());
         if ($confirmationStatus === \Magento\Customer\Model\AccountManagement::ACCOUNT_CONFIRMATION_REQUIRED) {
             $url = $this->_customerUrl->getEmailConfirmationUrl($customer->getEmail());
-            $this->messageManager->addSuccess(
+            $this->messageManager->addSuccessMessage(
                 // @codingStandardsIgnoreStart
                 __(
                     'You must confirm your account. Please check your email for the confirmation link or <a href="%1">click here</a> for a new link.',
diff --git a/app/code/Magento/Checkout/Observer/LoadCustomerQuoteObserver.php b/app/code/Magento/Checkout/Observer/LoadCustomerQuoteObserver.php
index 7b0aa82be31..63c573f2ffe 100644
--- a/app/code/Magento/Checkout/Observer/LoadCustomerQuoteObserver.php
+++ b/app/code/Magento/Checkout/Observer/LoadCustomerQuoteObserver.php
@@ -42,9 +42,9 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         try {
             $this->checkoutSession->loadCustomerQuote();
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addException($e, __('Load customer quote error'));
+            $this->messageManager->addExceptionMessage($e, __('Load customer quote error'));
         }
     }
 }
diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/ConfigureTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/ConfigureTest.php
index 05518e3ab94..aff19b10971 100644
--- a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/ConfigureTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/ConfigureTest.php
@@ -198,7 +198,7 @@ public function testRedirectWithWrongProductId()
         $quoteItemMock->expects($this->once())->method('getProduct')->willReturn($productMock);
         $productMock->expects($this->once())->method('getId')->willReturn($productIdInQuota);
         $this->messageManagerMock->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->willReturn('');
         $this->resultRedirectMock->expects($this->once())
             ->method('setPath')
diff --git a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php
index b8f46feab0a..1cf5006c20f 100644
--- a/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Controller/Cart/CouponPostTest.php
@@ -236,7 +236,7 @@ public function testExecuteWithGoodCouponAndItems()
             ->willReturn('CODE');
 
         $this->messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->willReturnSelf();
 
         $this->objectManagerMock->expects($this->once())
@@ -290,7 +290,7 @@ public function testExecuteWithGoodCouponAndNoItems()
             ->willReturnSelf();
 
         $this->messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->willReturnSelf();
 
         $this->objectManagerMock->expects($this->once())
@@ -344,7 +344,7 @@ public function testExecuteWithBadCouponAndItems()
             ->willReturnSelf();
 
         $this->messageManager->expects($this->once())
-            ->method('addSuccess')
+            ->method('addSuccessMessage')
             ->with('You canceled the coupon code.')
             ->willReturnSelf();
 
@@ -386,7 +386,7 @@ public function testExecuteWithBadCouponAndNoItems()
             ->willReturn($coupon);
 
         $this->messageManager->expects($this->once())
-            ->method('addError')
+            ->method('addErrorMessage')
             ->willReturnSelf();
 
         $this->objectManagerMock->expects($this->once())
diff --git a/app/code/Magento/Checkout/Test/Unit/Observer/LoadCustomerQuoteObserverTest.php b/app/code/Magento/Checkout/Test/Unit/Observer/LoadCustomerQuoteObserverTest.php
index ab207d0a67e..875bcda157a 100644
--- a/app/code/Magento/Checkout/Test/Unit/Observer/LoadCustomerQuoteObserverTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Observer/LoadCustomerQuoteObserverTest.php
@@ -40,7 +40,7 @@ public function testLoadCustomerQuoteThrowingCoreException()
         $this->checkoutSession->expects($this->once())->method('loadCustomerQuote')->willThrowException(
             new \Magento\Framework\Exception\LocalizedException(__('Message'))
         );
-        $this->messageManager->expects($this->once())->method('addError')->with('Message');
+        $this->messageManager->expects($this->once())->method('addErrorMessage')->with('Message');
 
         $observerMock = $this->getMockBuilder(\Magento\Framework\Event\Observer::class)
             ->disableOriginalConstructor()
@@ -55,7 +55,7 @@ public function testLoadCustomerQuoteThrowingException()
         $this->checkoutSession->expects($this->once())->method('loadCustomerQuote')->will(
             $this->throwException($exception)
         );
-        $this->messageManager->expects($this->once())->method('addException')
+        $this->messageManager->expects($this->once())->method('addExceptionMessage')
             ->with($exception, 'Load customer quote error');
 
         $observerMock = $this->getMockBuilder(\Magento\Framework\Event\Observer::class)
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js b/app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js
index 0210fa37bb9..3827a174b33 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js
@@ -144,7 +144,7 @@ define([
          */
         navigateTo: function (code, scrollToElementId) {
             var sortedItems = steps().sort(this.sortItems),
-                bodyElem = $.browser.safari || $.browser.chrome ? $('body') : $('html');
+                bodyElem = $('body');
 
             scrollToElementId = scrollToElementId || null;
 
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/progress-bar.js b/app/code/Magento/Checkout/view/frontend/web/js/view/progress-bar.js
index 0cbc16ef72b..72cf4e3d479 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/progress-bar.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/progress-bar.js
@@ -8,8 +8,7 @@ define([
     'underscore',
     'ko',
     'uiComponent',
-    'Magento_Checkout/js/model/step-navigator',
-    'jquery/jquery.hashchange'
+    'Magento_Checkout/js/model/step-navigator'
 ], function ($, _, ko, Component, stepNavigator) {
     'use strict';
 
@@ -25,7 +24,7 @@ define([
         /** @inheritdoc */
         initialize: function () {
             this._super();
-            $(window).hashchange(_.bind(stepNavigator.handleHash, stepNavigator));
+            window.addEventListener('hashchange', _.bind(stepNavigator.handleHash, stepNavigator));
             stepNavigator.handleHash();
         },
 
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/ConfigProviderFactory.php b/app/code/Magento/Cms/Model/Wysiwyg/ConfigProviderFactory.php
index 01faec48e2a..ee980cf7ff7 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/ConfigProviderFactory.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/ConfigProviderFactory.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Cms\Model\Wysiwyg;
 
 /**
@@ -15,7 +18,7 @@ class ConfigProviderFactory
      *
      * @var \Magento\Framework\ObjectManagerInterface
      */
-    protected $objectManager;
+    private $objectManager;
 
     /**
      * @param \Magento\Framework\ObjectManagerInterface $objectManager
diff --git a/app/code/Magento/Cms/view/adminhtml/web/js/folder-tree.js b/app/code/Magento/Cms/view/adminhtml/web/js/folder-tree.js
index 6dd0b39f692..62b5648f4a2 100644
--- a/app/code/Magento/Cms/view/adminhtml/web/js/folder-tree.js
+++ b/app/code/Magento/Cms/view/adminhtml/web/js/folder-tree.js
@@ -77,18 +77,28 @@ define([
         treeLoaded: function () {
             var path = this.options.currentPath,
                 tree = this.element,
+                lastExistentFolderEl,
 
                 /**
-                 * Recursive open.
+                 * Recursively open folders specified in path array.
                  */
                 recursiveOpen = function () {
-                    var el = $('[data-id="' + path.pop() + '"]');
+                    var folderEl = $('[data-id="' + path.pop() + '"]');
+
+                    // if folder doesn't exist, select the last opened folder
+                    if (!folderEl.length) {
+                        tree.jstree('select_node', lastExistentFolderEl);
+
+                        return;
+                    }
+
+                    lastExistentFolderEl = folderEl;
 
                     if (path.length > 1) {
-                        tree.jstree('open_node', el, recursiveOpen);
+                        tree.jstree('open_node', folderEl, recursiveOpen);
                     } else {
-                        tree.jstree('open_node', el, function () {
-                            tree.jstree('select_node', el);
+                        tree.jstree('open_node', folderEl, function () {
+                            tree.jstree('select_node', folderEl);
                         });
                     }
                 };
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
index 8264c7d7b39..a1e26b7805d 100644
--- a/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
+++ b/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
@@ -32,7 +32,6 @@
 require([
     "jquery",
     "uiRegistry",
-    "jquery/jquery.hashchange",
     "mage/mage",
     "prototype",
     "mage/adminhtml/form",
@@ -379,7 +378,7 @@ require([
         return false;
     };
 
-    jQuery(window).hashchange(handleHash);
+    window.addEventListener('hashchange', handleHash);
     handleHash();
 
     registry.set('adminSystemConfig', adminSystemConfig);
diff --git a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
index 08f5bbf1383..2502b79921e 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
@@ -74,6 +74,11 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
      */
     private $customerSession;
 
+    /**
+     * @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices
+     */
+    private $variationPrices;
+
     /**
      * @param \Magento\Catalog\Block\Product\Context $context
      * @param \Magento\Framework\Stdlib\ArrayUtils $arrayUtils
@@ -86,6 +91,7 @@ class Configurable extends \Magento\Catalog\Block\Product\View\AbstractView
      * @param array $data
      * @param Format|null $localeFormat
      * @param Session|null $customerSession
+     * @param \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices|null $variationPrices
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -99,7 +105,8 @@ public function __construct(
         ConfigurableAttributeData $configurableAttributeData,
         array $data = [],
         Format $localeFormat = null,
-        Session $customerSession = null
+        Session $customerSession = null,
+        \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices $variationPrices = null
     ) {
         $this->priceCurrency = $priceCurrency;
         $this->helper = $helper;
@@ -109,6 +116,9 @@ public function __construct(
         $this->configurableAttributeData = $configurableAttributeData;
         $this->localeFormat = $localeFormat ?: ObjectManager::getInstance()->get(Format::class);
         $this->customerSession = $customerSession ?: ObjectManager::getInstance()->get(Session::class);
+        $this->variationPrices = $variationPrices ?: ObjectManager::getInstance()->get(
+            \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices::class
+        );
 
         parent::__construct(
             $context,
@@ -211,9 +221,6 @@ public function getJsonConfig()
         $store = $this->getCurrentStore();
         $currentProduct = $this->getProduct();
 
-        $regularPrice = $currentProduct->getPriceInfo()->getPrice('regular_price');
-        $finalPrice = $currentProduct->getPriceInfo()->getPrice('final_price');
-
         $options = $this->helper->getOptions($currentProduct, $this->getAllowProducts());
         $attributesData = $this->configurableAttributeData->getAttributesData($currentProduct, $options);
 
@@ -223,17 +230,7 @@ public function getJsonConfig()
             'currencyFormat' => $store->getCurrentCurrency()->getOutputFormat(),
             'optionPrices' => $this->getOptionPrices(),
             'priceFormat' => $this->localeFormat->getPriceFormat(),
-            'prices' => [
-                'oldPrice' => [
-                    'amount' => $this->localeFormat->getNumber($regularPrice->getAmount()->getValue()),
-                ],
-                'basePrice' => [
-                    'amount' => $this->localeFormat->getNumber($finalPrice->getAmount()->getBaseAmount()),
-                ],
-                'finalPrice' => [
-                    'amount' => $this->localeFormat->getNumber($finalPrice->getAmount()->getValue()),
-                ],
-            ],
+            'prices' => $this->variationPrices->getFormattedPrices($this->getProduct()->getPriceInfo()),
             'productId' => $currentProduct->getId(),
             'chooseText' => __('Choose an Option...'),
             'images' => $this->getOptionImages(),
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Variations/Prices.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Variations/Prices.php
new file mode 100644
index 00000000000..b8a948d55f1
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Variations/Prices.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations;
+
+/**
+ * Configurable product variation prices.
+ */
+class Prices
+{
+    /**
+     * @var \Magento\Framework\Locale\Format
+     */
+    private $localeFormat;
+
+    /**
+     * Prices constructor.
+     * @param \Magento\Framework\Locale\Format $localeFormat
+     */
+    public function __construct(\Magento\Framework\Locale\Format $localeFormat)
+    {
+        $this->localeFormat = $localeFormat;
+    }
+
+    /**
+     * Get product prices for configurable variations
+     *
+     * @param \Magento\Framework\Pricing\PriceInfo\Base $priceInfo
+     * @return array
+     */
+    public function getFormattedPrices(\Magento\Framework\Pricing\PriceInfo\Base $priceInfo)
+    {
+        $regularPrice = $priceInfo->getPrice('regular_price');
+        $finalPrice = $priceInfo->getPrice('final_price');
+
+        return [
+            'oldPrice' => [
+                'amount' => $this->localeFormat->getNumber($regularPrice->getAmount()->getValue()),
+            ],
+            'basePrice' => [
+                'amount' => $this->localeFormat->getNumber($finalPrice->getAmount()->getBaseAmount()),
+            ],
+            'finalPrice' => [
+                'amount' => $this->localeFormat->getNumber($finalPrice->getAmount()->getValue()),
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/LinkedProductSelectBuilder.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/LinkedProductSelectBuilder.php
new file mode 100644
index 00000000000..3f1c22548c8
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/LinkedProductSelectBuilder.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ConfigurableProduct\Model\ResourceModel\Product;
+
+use Magento\Catalog\Model\ResourceModel\Product\BaseSelectProcessorInterface;
+use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
+
+/**
+ * A decorator for a linked product select builder.
+ *
+ * Extends functionality of the linked product select builder to allow perform
+ * some additional processing of built Select objects.
+ */
+class LinkedProductSelectBuilder implements LinkedProductSelectBuilderInterface
+{
+    /**
+     * @var BaseSelectProcessorInterface
+     */
+    private $baseSelectProcessor;
+
+    /**
+     * @var LinkedProductSelectBuilderInterface
+     */
+    private $linkedProductSelectBuilder;
+
+    /**
+     * @param BaseSelectProcessorInterface $baseSelectProcessor
+     * @param LinkedProductSelectBuilderInterface $linkedProductSelectBuilder
+     */
+    public function __construct(
+        BaseSelectProcessorInterface $baseSelectProcessor,
+        LinkedProductSelectBuilderInterface $linkedProductSelectBuilder
+    ) {
+        $this->baseSelectProcessor = $baseSelectProcessor;
+        $this->linkedProductSelectBuilder = $linkedProductSelectBuilder;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function build($productId)
+    {
+        $selects = $this->linkedProductSelectBuilder->build($productId);
+
+        foreach ($selects as $select) {
+            $this->baseSelectProcessor->process($select);
+        }
+
+        return $selects;
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/StockStatusBaseSelectProcessor.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/StockStatusBaseSelectProcessor.php
new file mode 100644
index 00000000000..bc118043adc
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/StockStatusBaseSelectProcessor.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ConfigurableProduct\Model\ResourceModel\Product;
+
+use Magento\Framework\DB\Select;
+use Magento\Catalog\Model\ResourceModel\Product\BaseSelectProcessorInterface;
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\CatalogInventory\Model\Stock\Status as StockStatus;
+use Magento\CatalogInventory\Model\ResourceModel\Stock\Status as StockStatusResource;
+
+/**
+ * A Select object processor.
+ *
+ * Adds stock status limitations to a given Select object.
+ */
+class StockStatusBaseSelectProcessor implements BaseSelectProcessorInterface
+{
+    /**
+     * @var StockConfigurationInterface
+     */
+    private $stockConfig;
+
+    /**
+     * @var StockStatusResource
+     */
+    private $stockStatusResource;
+
+    /**
+     * @param StockConfigurationInterface $stockConfig
+     * @param StockStatusResource $stockStatusResource
+     */
+    public function __construct(
+        StockConfigurationInterface $stockConfig,
+        StockStatusResource $stockStatusResource
+    ) {
+        $this->stockConfig = $stockConfig;
+        $this->stockStatusResource = $stockStatusResource;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(Select $select)
+    {
+        if ($this->stockConfig->isShowOutOfStock()) {
+            $select->joinInner(
+                ['stock' => $this->stockStatusResource->getMainTable()],
+                sprintf(
+                    'stock.product_id = %s.entity_id',
+                    BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS
+                ),
+                []
+            )->where(
+                'stock.stock_status = ?',
+                StockStatus::STATUS_IN_STOCK
+            );
+        }
+
+        return $select;
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php b/app/code/Magento/ConfigurableProduct/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php
new file mode 100644
index 00000000000..efddb278df3
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Plugin/Catalog/Model/Product/Pricing/Renderer/SalableResolver.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ConfigurableProduct\Plugin\Catalog\Model\Product\Pricing\Renderer;
+
+use Magento\ConfigurableProduct\Pricing\Price\LowestPriceOptionsProviderInterface;
+
+/**
+ * A plugin for a salable resolver.
+ */
+class SalableResolver
+{
+    /**
+     * @var LowestPriceOptionsProviderInterface
+     */
+    private $lowestPriceOptionsProvider;
+
+    /**
+     * @param LowestPriceOptionsProviderInterface $lowestPriceOptionsProvider
+     */
+    public function __construct(
+        LowestPriceOptionsProviderInterface $lowestPriceOptionsProvider
+    ) {
+        $this->lowestPriceOptionsProvider = $lowestPriceOptionsProvider;
+    }
+
+    /**
+     * Performs an additional check whether given configurable product has
+     * at least one configuration in-stock.
+     *
+     * @param \Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver $subject
+     * @param bool $result
+     * @param \Magento\Framework\Pricing\SaleableInterface $salableItem
+     *
+     * @return bool
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterIsSalable(
+        \Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver $subject,
+        $result,
+        \Magento\Framework\Pricing\SaleableInterface $salableItem
+    ) {
+        if ($salableItem->getTypeId() == 'configurable' && $result) {
+            if (!$this->lowestPriceOptionsProvider->getProducts($salableItem)) {
+                $result = false;
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php
index db3c30e3b4e..b45306d670b 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php
@@ -78,6 +78,11 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
      */
     private $customerSession;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $variationPricesMock;
+
     protected function setUp()
     {
         $this->mockContextObject();
@@ -144,6 +149,10 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
+        $this->variationPricesMock = $this->createMock(
+            \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices::class
+        );
+
         $this->block = new \Magento\ConfigurableProduct\Block\Product\View\Type\Configurable(
             $this->context,
             $this->arrayUtils,
@@ -155,7 +164,8 @@ protected function setUp()
             $this->configurableAttributeData,
             [],
             $this->localeFormat,
-            $this->customerSession
+            $this->customerSession,
+            $this->variationPricesMock
         );
     }
 
@@ -260,12 +270,8 @@ public function testGetJsonConfig()
                 'getAmount',
             ])
             ->getMockForAbstractClass();
-        $priceMock->expects($this->any())
-            ->method('getAmount')
-            ->willReturn($amountMock);
-
+        $priceMock->expects($this->any())->method('getAmount')->willReturn($amountMock);
         $tierPriceMock = $this->getTierPriceMock($amountMock, $priceQty, $percentage);
-
         $productMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -283,27 +289,16 @@ public function testGetJsonConfig()
                 ['tier_price', $tierPriceMock],
             ]);
 
-        $productMock->expects($this->any())
-            ->method('getTypeInstance')
-            ->willReturn($productTypeMock);
-        $productMock->expects($this->any())
-            ->method('getPriceInfo')
-            ->willReturn($priceInfoMock);
-        $productMock->expects($this->any())
-            ->method('isSaleable')
-            ->willReturn(true);
-        $productMock->expects($this->any())
-            ->method('getId')
-            ->willReturn($productId);
+        $productMock->expects($this->any())->method('getTypeInstance')->willReturn($productTypeMock);
+        $productMock->expects($this->any())->method('getPriceInfo')->willReturn($priceInfoMock);
+        $productMock->expects($this->any())->method('isSaleable')->willReturn(true);
+        $productMock->expects($this->any())->method('getId')->willReturn($productId);
 
         $this->helper->expects($this->any())
             ->method('getOptions')
             ->with($productMock, [$productMock])
             ->willReturn([]);
-
-        $this->product->expects($this->any())
-            ->method('getSkipSaleableCheck')
-            ->willReturn(true);
+        $this->product->expects($this->any())->method('getSkipSaleableCheck')->willReturn(true);
 
         $attributesData = [
             'attributes' => [],
@@ -315,9 +310,7 @@ public function testGetJsonConfig()
             ->with($productMock, [])
             ->willReturn($attributesData);
 
-        $this->localeFormat->expects($this->any())
-            ->method('getPriceFormat')
-            ->willReturn([]);
+        $this->localeFormat->expects($this->atLeastOnce())->method('getPriceFormat')->willReturn([]);
         $this->localeFormat->expects($this->any())
             ->method('getNumber')
             ->willReturnMap([
@@ -326,16 +319,29 @@ public function testGetJsonConfig()
                 [$percentage, $percentage],
             ]);
 
+        $this->variationPricesMock->expects($this->once())
+            ->method('getFormattedPrices')
+            ->with($priceInfoMock)
+            ->willReturn(
+                [
+                    'oldPrice' => [
+                        'amount' => $amount,
+                    ],
+                    'basePrice' => [
+                        'amount' => $amount,
+                    ],
+                    'finalPrice' => [
+                        'amount' => $amount,
+                    ],
+                ]
+            );
+
         $expectedArray = $this->getExpectedArray($productId, $amount, $priceQty, $percentage);
         $expectedJson = json_encode($expectedArray);
 
-        $this->jsonEncoder->expects($this->once())
-            ->method('encode')
-            ->with($expectedArray)
-            ->willReturn($expectedJson);
+        $this->jsonEncoder->expects($this->once())->method('encode')->with($expectedArray)->willReturn($expectedJson);
 
         $this->block->setData('product', $productMock);
-
         $result = $this->block->getJsonConfig();
         $this->assertEquals($expectedJson, $result);
     }
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/Variations/PricesTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/Variations/PricesTest.php
new file mode 100644
index 00000000000..b4e7689498f
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/Variations/PricesTest.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Test\Unit\Model\Product\Type\Configurable\Variations;
+
+use PHPUnit\Framework\TestCase;
+
+class PricesTest extends TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $localeFormatMock;
+
+    /**
+     * @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->localeFormatMock = $this->createMock(\Magento\Framework\Locale\Format::class);
+        $this->model = new \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices(
+            $this->localeFormatMock
+        );
+    }
+
+    public function testGetFormattedPrices()
+    {
+        $expected = [
+            'oldPrice' => [
+                'amount' => 500
+            ],
+            'basePrice' => [
+                'amount' => 1000
+            ],
+            'finalPrice' => [
+                'amount' => 500
+            ]
+        ];
+        $priceInfoMock = $this->createMock(\Magento\Framework\Pricing\PriceInfo\Base::class);
+        $priceMock = $this->createMock(\Magento\Framework\Pricing\Price\PriceInterface::class);
+        $priceInfoMock->expects($this->atLeastOnce())->method('getPrice')->willReturn($priceMock);
+
+        $amountMock = $this->createMock(\Magento\Framework\Pricing\Amount\AmountInterface::class);
+        $amountMock->expects($this->atLeastOnce())->method('getValue')->willReturn(500);
+        $amountMock->expects($this->atLeastOnce())->method('getBaseAmount')->willReturn(1000);
+        $priceMock->expects($this->atLeastOnce())->method('getAmount')->willReturn($amountMock);
+
+        $this->localeFormatMock->expects($this->atLeastOnce())
+            ->method('getNumber')
+            ->withConsecutive([500], [1000], [500])
+            ->will($this->onConsecutiveCalls(500, 1000, 500));
+
+        $this->assertEquals($expected, $this->model->getFormattedPrices($priceInfoMock));
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/LinkedProductSelectBuilderTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/LinkedProductSelectBuilderTest.php
new file mode 100644
index 00000000000..3ef03f32ae0
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/LinkedProductSelectBuilderTest.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ConfigurableProduct\Test\Unit\Model\ResourceModel\Product;
+
+use Magento\Framework\DB\Select;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Catalog\Model\ResourceModel\Product\BaseSelectProcessorInterface;
+use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\LinkedProductSelectBuilder;
+
+class LinkedProductSelectBuilderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var LinkedProductSelectBuilder
+     */
+    private $subject;
+
+    /**
+     * @var BaseSelectProcessorInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $baseSelectProcessorMock;
+
+    /**
+     * @var LinkedProductSelectBuilderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $linkedProductSelectBuilderMock;
+
+    protected function setUp()
+    {
+        $this->baseSelectProcessorMock = $this->getMockBuilder(BaseSelectProcessorInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->linkedProductSelectBuilderMock = $this->getMockBuilder(LinkedProductSelectBuilderInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->subject = (new ObjectManager($this))->getObject(
+            LinkedProductSelectBuilder::class,
+            [
+                'baseSelectProcessor' => $this->baseSelectProcessorMock,
+                'linkedProductSelectBuilder' => $this->linkedProductSelectBuilderMock,
+            ]
+        );
+    }
+
+    public function testBuild()
+    {
+        $productId = 42;
+
+        /** @var Select|\PHPUnit_Framework_MockObject_MockObject $selectMock */
+        $selectMock = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $expectedResult = [$selectMock];
+
+        $this->linkedProductSelectBuilderMock->expects($this->any())
+            ->method('build')
+            ->with($productId)
+            ->willReturn($expectedResult);
+
+        $this->baseSelectProcessorMock->expects($this->once())
+            ->method('process')
+            ->with($selectMock);
+
+        $this->assertEquals($expectedResult, $this->subject->build($productId));
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/StockStatusBaseSelectProcessorTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/StockStatusBaseSelectProcessorTest.php
new file mode 100644
index 00000000000..5717e995f9f
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/ResourceModel/Product/StockStatusBaseSelectProcessorTest.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ConfigurableProduct\Test\Unit\Model\ResourceModel\Product;
+
+use Magento\Framework\DB\Select;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Catalog\Model\ResourceModel\Product\BaseSelectProcessorInterface;
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
+use Magento\CatalogInventory\Model\Stock\Status as StockStatus;
+use Magento\CatalogInventory\Model\ResourceModel\Stock\Status as StockStatusResource;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\StockStatusBaseSelectProcessor;
+
+class StockStatusBaseSelectProcessorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var StockStatusBaseSelectProcessor
+     */
+    private $subject;
+
+    /**
+     * @var StockConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $stockConfigMock;
+
+    /**
+     * @var string
+     */
+    private $stockStatusTable = 'cataloginventory_stock_status';
+
+    /**
+     * @var StockStatusResource|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $stockStatusResourceMock;
+
+    protected function setUp()
+    {
+        $this->stockConfigMock = $this->getMockBuilder(StockConfigurationInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->stockStatusResourceMock = $this->getMockBuilder(StockStatusResource::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->stockStatusResourceMock->expects($this->any())
+            ->method('getMainTable')
+            ->willReturn($this->stockStatusTable);
+
+        $this->subject = (new ObjectManager($this))->getObject(
+            StockStatusBaseSelectProcessor::class,
+            [
+                'stockConfig' => $this->stockConfigMock,
+                'stockStatusResource' => $this->stockStatusResourceMock,
+            ]
+        );
+    }
+
+    /**
+     * @param bool $isShowOutOfStock
+     *
+     * @dataProvider processDataProvider
+     */
+    public function testProcess($isShowOutOfStock)
+    {
+        $this->stockConfigMock->expects($this->any())
+            ->method('isShowOutOfStock')
+            ->willReturn($isShowOutOfStock);
+
+        /** @var Select|\PHPUnit_Framework_MockObject_MockObject $selectMock */
+        $selectMock = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        if ($isShowOutOfStock) {
+            $selectMock->expects($this->once())
+                ->method('joinInner')
+                ->with(
+                    ['stock' => $this->stockStatusTable],
+                    sprintf(
+                        'stock.product_id = %s.entity_id',
+                        BaseSelectProcessorInterface::PRODUCT_TABLE_ALIAS
+                    ),
+                    []
+                )
+                ->willReturnSelf();
+            $selectMock->expects($this->once())
+                ->method('where')
+                ->with(
+                    'stock.stock_status = ?',
+                    StockStatus::STATUS_IN_STOCK
+                )
+                ->willReturnSelf();
+        } else {
+            $selectMock->expects($this->never())
+                ->method($this->anything());
+        }
+
+        $this->assertEquals($selectMock, $this->subject->process($selectMock));
+    }
+
+    /**
+     * @return array
+     */
+    public function processDataProvider()
+    {
+        return [
+            'Out of stock products are being displayed' => [true],
+            'Out of stock products are NOT being displayed' => [false],
+        ];
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php
index 67f758af22b..c3f2008c8a6 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Ui/DataProvider/Product/Form/Modifier/CompositeTest.php
@@ -164,15 +164,21 @@ public function testDisallowModifyMeta()
     {
         $meta = ['some meta'];
         $modifiers = ['modifier1', 'modifier2'];
-        $this->productMock->expects(static::any())
+        $this->productMock->expects(self::any())
             ->method('getTypeId')
             ->willReturn(ConfigurableType::TYPE_CODE);
-        $this->allowedProductTypesMock->expects(static::once())
+        $this->allowedProductTypesMock->expects(self::once())
             ->method('isAllowedProductType')
             ->with($this->productMock)
             ->willReturn(false);
-        $this->objectManagerMock->expects(static::never())
-            ->method('get');
+        $this->objectManagerMock->expects(self::exactly(2))
+            ->method('get')
+            ->willReturnMap(
+                [
+                    ['modifier1', $this->createModifierMock($meta, ['modifier1_meta'])],
+                    ['modifier2', $this->createModifierMock(['modifier1_meta'], $meta)],
+                ]
+            );
 
         $this->assertSame($meta, $this->createCompositeModifier($modifiers)->modifyMeta($meta));
     }
diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Composite.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Composite.php
index c9c3a5659aa..2d727b81143 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Composite.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/Composite.php
@@ -44,6 +44,11 @@ class Composite extends AbstractModifier
      */
     protected $allowedProductTypes;
 
+    /**
+     * @var ModifierInterface[]
+     */
+    private $modifiersObjects = [];
+
     /**
      * @param LocatorInterface $locator
      * @param ObjectManagerInterface $objectManager
@@ -63,6 +68,19 @@ public function __construct(
         $this->associatedProducts = $associatedProducts;
         $this->allowedProductTypes = $allowedProductTypes;
         $this->modifiers = $modifiers;
+
+        foreach ($this->modifiers as $modifierClass) {
+            /** @var ModifierInterface $bundleModifier */
+            $modifier = $this->objectManager->get($modifierClass);
+            if (!$modifier instanceof ModifierInterface) {
+                throw new \InvalidArgumentException(__(
+                    'Type %1 is not an instance of %2',
+                    $modifierClass,
+                    ModifierInterface::class
+                ));
+            }
+            $this->modifiersObjects[] = $modifier;
+        }
     }
 
     /**
@@ -86,6 +104,10 @@ public function modifyData(array $data)
             }
         }
 
+        foreach ($this->modifiersObjects as $modifier) {
+            $data = $modifier->modifyData($data);
+        }
+
         return $data;
     }
 
@@ -95,19 +117,11 @@ public function modifyData(array $data)
     public function modifyMeta(array $meta)
     {
         if ($this->allowedProductTypes->isAllowedProductType($this->locator->getProduct())) {
-            foreach ($this->modifiers as $modifierClass) {
-                /** @var ModifierInterface $bundleModifier */
-                $modifier = $this->objectManager->get($modifierClass);
-                if (!$modifier instanceof ModifierInterface) {
-                    throw new \InvalidArgumentException(__(
-                        'Type %1 is not an instance of %2',
-                        $modifierClass,
-                        ModifierInterface::class
-                    ));
-                }
+            foreach ($this->modifiersObjects as $modifier) {
                 $meta = $modifier->modifyMeta($meta);
             }
         }
+
         return $meta;
     }
 }
diff --git a/app/code/Magento/ConfigurableProduct/etc/di.xml b/app/code/Magento/ConfigurableProduct/etc/di.xml
index b9ea0c7e270..3f04081eaf6 100644
--- a/app/code/Magento/ConfigurableProduct/etc/di.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/di.xml
@@ -196,4 +196,17 @@
             <argument name="productIndexer" xsi:type="object">Magento\Catalog\Model\Indexer\Product\Full</argument>
         </arguments>
     </type>
+    <type name="Magento\ConfigurableProduct\Pricing\Price\LowestPriceOptionsProvider">
+        <arguments>
+            <argument name="linkedProductSelectBuilder" xsi:type="object">Magento\ConfigurableProduct\Model\ResourceModel\Product\LinkedProductSelectBuilder</argument>
+        </arguments>
+    </type>
+    <type name="Magento\ConfigurableProduct\Model\ResourceModel\Product\LinkedProductSelectBuilder">
+        <arguments>
+            <argument name="baseSelectProcessor" xsi:type="object">Magento\ConfigurableProduct\Model\ResourceModel\Product\StockStatusBaseSelectProcessor</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Catalog\Model\Product\Pricing\Renderer\SalableResolver">
+        <plugin name="configurable" type="Magento\ConfigurableProduct\Plugin\Catalog\Model\Product\Pricing\Renderer\SalableResolver" />
+    </type>
 </config>
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
index 01abce76960..94a24779450 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js
@@ -349,8 +349,6 @@ define([
             );
 
             _.each(data, function (row) {
-                var attributesText;
-
                 if (row.productId) {
                     index = _.indexOf(productIdsToDelete, row.productId);
 
@@ -364,36 +362,8 @@ define([
                         );
                     }
                 }
+                product = this.getProductData(row);
 
-                attributesText = '';
-                _.each(row.options, function (attribute) {
-                    if (attributesText) {
-                        attributesText += ', ';
-                    }
-                    attributesText += attribute['attribute_label'] + ': ' + attribute.label;
-                }, this);
-
-                product = {
-                    'id': row.productId,
-                    'product_link': row.productUrl,
-                    'name': row.name,
-                    'sku': row.sku,
-                    'status': row.status,
-                    'price': row.price,
-                    'price_currency': row.priceCurrency,
-                    'price_string': row.priceCurrency + row.price,
-                    'weight': row.weight,
-                    'qty': row.quantity,
-                    'variationKey': row.variationKey,
-                    'configurable_attribute': row.attribute,
-                    'thumbnail_image': row.images.preview,
-                    'media_gallery': row['media_gallery'],
-                    'swatch_image': row['swatch_image'],
-                    'small_image': row['small_image'],
-                    image: row.image,
-                    'thumbnail': row.thumbnail,
-                    'attributes': attributesText
-                };
                 product[this.changedFlag] = true;
                 product[this.canEditField] = row.editable;
                 product[this.newProductField] = row.newProduct;
@@ -412,6 +382,47 @@ define([
             this.unionInsertData(tmpArray);
         },
 
+        /**
+         *
+         * @param {Object} row
+         * @returns {Object}
+         */
+        getProductData: function (row) {
+            var product,
+                attributesText = '';
+
+            _.each(row.options, function (attribute) {
+                if (attributesText) {
+                    attributesText += ', ';
+                }
+                attributesText += attribute['attribute_label'] + ': ' + attribute.label;
+            }, this);
+
+            product = {
+                'id': row.productId,
+                'product_link': row.productUrl,
+                'name': row.name,
+                'sku': row.sku,
+                'status': row.status,
+                'price': row.price,
+                'price_currency': row.priceCurrency,
+                'price_string': row.priceCurrency + row.price,
+                'weight': row.weight,
+                'qty': row.quantity,
+                'variationKey': row.variationKey,
+                'configurable_attribute': row.attribute,
+                'thumbnail_image': row.images.preview,
+                'media_gallery': row['media_gallery'],
+                'swatch_image': row['swatch_image'],
+                'small_image': row['small_image'],
+                image: row.image,
+                'thumbnail': row.thumbnail,
+                'attributes': attributesText
+            };
+
+            return product;
+        },
+
         /**
          * Remove array items matching condition.
          *
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/bulk.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/bulk.js
index 8ae6804908c..00bf1feff7f 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/bulk.js
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/bulk.js
@@ -78,10 +78,12 @@ define([
              * Make options sections.
              */
             this.makeOptionSections = function () {
-                this.images = new self.makeImages(null);
-                this.price = self.price;
-                this.quantity = self.quantity;
-            };
+                return {
+                    images: new this.makeImages(null),
+                    price: this.price,
+                    quantity: this.quantity
+                };
+            }.bind(this);
 
             /**
              * @param {Object} images
@@ -152,7 +154,7 @@ define([
             //fill option section data
             this.attributes.each(function (attribute) {
                 attribute.chosen.each(function (option) {
-                    option.sections = ko.observable(new this.makeOptionSections());
+                    option.sections = ko.observable(this.makeOptionSections());
                 }, this);
             }, this);
             //reset section.attribute
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/summary.js b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/summary.js
index dc83a588999..ac952ca531a 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/summary.js
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/variations/steps/summary.js
@@ -53,7 +53,8 @@ define([
             attributes: [],
             attributesName: [$.mage.__('Images'), $.mage.__('SKU'), $.mage.__('Quantity'), $.mage.__('Price')],
             sections: [],
-            gridTemplate: 'Magento_ConfigurableProduct/variations/steps/summary-grid'
+            gridTemplate: 'Magento_ConfigurableProduct/variations/steps/summary-grid',
+            quantityFieldName: 'quantity'
         },
 
         /** @inheritdoc */
@@ -112,12 +113,12 @@ define([
                     return memo + '-' + option.label;
                 }, '');
                 name = productName + _.reduce(options, function (memo, option) {
-                        return memo + '-' + option.label;
-                    }, '');
-                quantity = getSectionValue('quantity', options);
+                    return memo + '-' + option.label;
+                }, '');
+                quantity = getSectionValue(this.quantityFieldName, options);
 
                 if (!quantity && productId) {
-                    quantity = product.quantity;
+                    quantity = product[this.quantityFieldName];
                 }
                 price = getSectionValue('price', options);
 
@@ -133,12 +134,12 @@ define([
                     images: images,
                     sku: sku,
                     name: name,
-                    quantity: quantity,
                     price: price,
                     productId: productId,
                     weight: productWeight,
                     editable: true
                 };
+                variation[this.quantityFieldName] = quantity;
 
                 if (productId) {
                     variation.sku = product.sku;
@@ -163,7 +164,6 @@ define([
             this.variationsExisting = gridExisting;
             this.variationsNew = gridNew;
             this.variationsDeleted = gridDeleted;
-
         },
 
         /**
@@ -195,7 +195,7 @@ define([
                 images: []
             }, variation.images));
             row.push(variation.sku);
-            row.push(variation.quantity);
+            row.push(variation[this.quantityFieldName]);
             _.each(variation.options, function (option) {
                 row.push(option.label);
             });
diff --git a/app/code/Magento/Cron/Setup/Recurring.php b/app/code/Magento/Cron/Setup/Recurring.php
index 38c9122783b..e45524c174a 100644
--- a/app/code/Magento/Cron/Setup/Recurring.php
+++ b/app/code/Magento/Cron/Setup/Recurring.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Cron\Setup;
 
diff --git a/app/code/Magento/Customer/Controller/Account/Index.php b/app/code/Magento/Customer/Controller/Account/Index.php
index f734660fc3a..2ecf79d35b1 100644
--- a/app/code/Magento/Customer/Controller/Account/Index.php
+++ b/app/code/Magento/Customer/Controller/Account/Index.php
@@ -35,9 +35,6 @@ public function __construct(
      */
     public function execute()
     {
-        /** @var \Magento\Framework\View\Result\Page $resultPage */
-        $resultPage = $this->resultPageFactory->create();
-        $resultPage->getConfig()->getTitle()->set(__('My Account'));
-        return $resultPage;
+        return $this->resultPageFactory->create();
     }
 }
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Section/LoadTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Section/LoadTest.php
index 2552beeca46..3e9089c4732 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Section/LoadTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Section/LoadTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Customer\Test\Unit\Controller\Section;
 
 use Magento\Customer\Controller\Section\Load;
diff --git a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
index ac03fa7d293..4224e84972f 100644
--- a/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
+++ b/app/code/Magento/Customer/view/frontend/layout/customer_account.xml
@@ -6,6 +6,9 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="2columns-left" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd" label="Customer My Account (All Pages)" design_abstraction="custom">
+    <head>
+        <title>My Account</title>
+    </head>
     <body>
         <attribute name="class" value="account"/>
         <referenceContainer name="sidebar.main">
diff --git a/app/code/Magento/Deploy/Service/DeployPackage.php b/app/code/Magento/Deploy/Service/DeployPackage.php
index 7a5eb099124..3b7b5b77a07 100644
--- a/app/code/Magento/Deploy/Service/DeployPackage.php
+++ b/app/code/Magento/Deploy/Service/DeployPackage.php
@@ -95,11 +95,10 @@ public function __construct(
     public function deploy(Package $package, array $options, $skipLogging = false)
     {
         $result = $this->appState->emulateAreaCode(
-            $package->getArea() == Package::BASE_AREA ? 'global' : $package->getArea(),
+            $package->getArea() === Package::BASE_AREA ? 'global' : $package->getArea(),
             function () use ($package, $options, $skipLogging) {
                 // emulate application locale needed for correct file path resolving
                 $this->localeResolver->setLocale($package->getLocale());
-
                 $this->deployEmulated($package, $options, $skipLogging);
             }
         );
@@ -111,7 +110,7 @@ function () use ($package, $options, $skipLogging) {
      * @param Package $package
      * @param array $options
      * @param bool $skipLogging
-     * @return int
+     * @return bool
      */
     public function deployEmulated(Package $package, array $options, $skipLogging = false)
     {
@@ -206,7 +205,7 @@ private function checkIfCanCopy(PackageFile $file, Package $package, Package $pa
             || $file->getTheme() !== $package->getTheme()
             || $file->getLocale() !== $package->getLocale()
         )
-        && $file->getOrigPackage() == $parentPackage
+        && $file->getOrigPackage() === $parentPackage
         && $this->deployStaticFile->readFile($file->getDeployedFileId(), $parentPackage->getPath());
     }
 
@@ -219,10 +218,10 @@ private function checkIfCanCopy(PackageFile $file, Package $package, Package $pa
      */
     private function checkFileSkip($filePath, array $options)
     {
-        if ($filePath != '.') {
+        if ($filePath !== '.') {
             $ext = strtolower(pathinfo($filePath, PATHINFO_EXTENSION));
             $basename = pathinfo($filePath, PATHINFO_BASENAME);
-            if ($ext == 'less' && strpos($basename, '_') === 0) {
+            if ($ext === 'less' && strpos($basename, '_') === 0) {
                 return true;
             }
             $option = isset(InputValidator::$fileExtensionOptionMap[$ext])
diff --git a/app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php b/app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php
index 7a7deba98ea..cc3760b6846 100644
--- a/app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php
+++ b/app/code/Magento/Developer/Console/Command/GeneratePatchCommand.php
@@ -53,33 +53,33 @@ public function __construct(ComponentRegistrar $componentRegistrar)
     protected function configure()
     {
         $this->setName(self::COMMAND_NAME)
-             ->setDescription('Generate patch and put it in specific folder.')
-             ->setDefinition([
-                 new InputArgument(
-                     self::MODULE_NAME,
-                     InputArgument::REQUIRED,
-                     'Module name'
-                 ),
-                 new InputArgument(
-                     self::INPUT_KEY_PATCH_NAME,
-                     InputArgument::REQUIRED,
-                     'Patch name'
-                 ),
-                 new InputOption(
-                     self::INPUT_KEY_IS_REVERTABLE,
-                     null,
-                     InputOption::VALUE_OPTIONAL,
-                     'Check whether patch is revertable or not.',
-                     false
-                 ),
-                 new InputOption(
-                     self::INPUT_KEY_PATCH_TYPE,
-                     null,
-                     InputOption::VALUE_OPTIONAL,
-                     'Find out what type of patch should be generated.',
-                     'data'
-                 ),
-             ]);
+            ->setDescription('Generate patch and put it in specific folder.')
+            ->setDefinition([
+                new InputArgument(
+                    self::MODULE_NAME,
+                    InputArgument::REQUIRED,
+                    'Module name'
+                ),
+                new InputArgument(
+                    self::INPUT_KEY_PATCH_NAME,
+                    InputArgument::REQUIRED,
+                    'Patch name'
+                ),
+                new InputOption(
+                    self::INPUT_KEY_IS_REVERTABLE,
+                    null,
+                    InputOption::VALUE_OPTIONAL,
+                    'Check whether patch is revertable or not.',
+                    false
+                ),
+                new InputOption(
+                    self::INPUT_KEY_PATCH_TYPE,
+                    null,
+                    InputOption::VALUE_OPTIONAL,
+                    'Find out what type of patch should be generated.',
+                    'data'
+                ),
+            ]);
 
         parent::configure();
     }
diff --git a/app/code/Magento/Directory/etc/zip_codes.xml b/app/code/Magento/Directory/etc/zip_codes.xml
index 286278ac7ec..d9041d1ff50 100644
--- a/app/code/Magento/Directory/etc/zip_codes.xml
+++ b/app/code/Magento/Directory/etc/zip_codes.xml
@@ -207,7 +207,7 @@
     <zip countryCode="JP">
         <codes>
             <code id="pattern_1" active="true" example="123-4567">^[0-9]{3}-[0-9]{4}$</code>
-            <code id="pattern_2" active="true" example="123">^[0-9]{3}$</code>
+            <code id="pattern_2" active="true" example="1234567">^[0-9]{7}$</code>
         </codes>
     </zip>
     <zip countryCode="JE">
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
index 94dc0ee7493..dc928b4c794 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
@@ -142,7 +142,7 @@ protected function _getMultiSelectHtmlWithValue(Attribute $attribute, $value)
         if ($attribute->getFilterOptions()) {
             $options = $attribute->getFilterOptions();
         } else {
-            $options = $attribute->getSource()->getAllOptions(false);
+            $options = $attribute->getSource()->getAllOptions();
 
             foreach ($options as $key => $optionParams) {
                 if ('' === $optionParams['value']) {
@@ -151,12 +151,13 @@ protected function _getMultiSelectHtmlWithValue(Attribute $attribute, $value)
                 }
             }
         }
+
         if ($size = count($options)) {
             $arguments = [
                 'name' => $this->getFilterElementName($attribute->getAttributeCode()) . '[]',
                 'id' => $this->getFilterElementId($attribute->getAttributeCode()),
                 'class' => 'multiselect multiselect-export-filter',
-                'extra_params' => 'multiple="multiple" size="' . ($size > 5 ? 5 : ($size < 2 ? 2 : $size)),
+                'extra_params' => 'multiple="multiple" size="' . ($size > 5 ? 5 : ($size < 2 ? 2 : $size)) . '"',
             ];
             /** @var $selectBlock \Magento\Framework\View\Element\Html\Select */
             $selectBlock = $this->_layout->createBlock(
@@ -364,6 +365,9 @@ public function decorateFilter($value, Attribute $row, \Magento\Framework\DataOb
             case \Magento\ImportExport\Model\Export::FILTER_TYPE_SELECT:
                 $cell = $this->_getSelectHtmlWithValue($row, $value);
                 break;
+            case \Magento\ImportExport\Model\Export::FILTER_TYPE_MULTISELECT:
+                $cell = $this->_getMultiSelectHtmlWithValue($row, $value);
+                break;
             case \Magento\ImportExport\Model\Export::FILTER_TYPE_INPUT:
                 $cell = $this->_getInputHtmlWithValue($row, $value);
                 break;
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php
index 33dbba83200..7c119e1dd68 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php
@@ -5,9 +5,11 @@
  */
 namespace Magento\ImportExport\Controller\Adminhtml\Import;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\ImportExport\Controller\Adminhtml\Import as ImportController;
-use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
  * Download sample file controller
@@ -37,20 +39,26 @@ class Download extends ImportController
     protected $fileFactory;
 
     /**
-     * Constructor
-     *
+     * @var \Magento\ImportExport\Model\Import\SampleFileProvider
+     */
+    private $sampleFileProvider;
+
+    /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
      * @param \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory
+     * @param \Magento\ImportExport\Model\Import\SampleFileProvider $sampleFileProvider
      * @param ComponentRegistrar $componentRegistrar
+     * @param \Magento\ImportExport\Model\Import\SampleFileProvider|null $sampleFileProvider
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
         \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
         \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory,
-        \Magento\Framework\Component\ComponentRegistrar $componentRegistrar
+        \Magento\Framework\Component\ComponentRegistrar $componentRegistrar,
+        \Magento\ImportExport\Model\Import\SampleFileProvider $sampleFileProvider = null
     ) {
         parent::__construct(
             $context
@@ -59,6 +67,9 @@ public function __construct(
         $this->resultRawFactory = $resultRawFactory;
         $this->readFactory = $readFactory;
         $this->componentRegistrar = $componentRegistrar;
+        $this->sampleFileProvider = $sampleFileProvider
+            ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\ImportExport\Model\Import\SampleFileProvider::class);
     }
 
     /**
@@ -68,22 +79,23 @@ public function __construct(
      */
     public function execute()
     {
-        $fileName = $this->getRequest()->getParam('filename') . '.csv';
-        $moduleDir = $this->componentRegistrar->getPath(ComponentRegistrar::MODULE, self::SAMPLE_FILES_MODULE);
-        $fileAbsolutePath = $moduleDir . '/Files/Sample/' . $fileName;
-        $directoryRead = $this->readFactory->create($moduleDir);
-        $filePath = $directoryRead->getRelativePath($fileAbsolutePath);
-
-        if (!$directoryRead->isFile($filePath)) {
-            /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+        $entityName = $this->getRequest()->getParam('filename');
+
+        if (preg_match('/^\w+$/', $entityName) == 0) {
+            $this->messageManager->addErrorMessage(__('Incorrect entity name.'));
+
+            return $this->getResultRedirect();
+        }
+        try {
+            $fileContents = $this->sampleFileProvider->getFileContents($entityName);
+        } catch (NoSuchEntityException $e) {
             $this->messageManager->addError(__('There is no sample file for this entity.'));
-            $resultRedirect = $this->resultRedirectFactory->create();
-            $resultRedirect->setPath('*/import');
-            return $resultRedirect;
+
+            return $this->getResultRedirect();
         }
 
-        $fileSize = isset($directoryRead->stat($filePath)['size'])
-            ? $directoryRead->stat($filePath)['size'] : null;
+        $fileSize = $this->sampleFileProvider->getSize($entityName);
+        $fileName = $entityName . '.csv';
 
         $this->fileFactory->create(
             $fileName,
@@ -95,7 +107,18 @@ public function execute()
 
         /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
         $resultRaw = $this->resultRawFactory->create();
-        $resultRaw->setContents($directoryRead->readFile($filePath));
+        $resultRaw->setContents($fileContents);
         return $resultRaw;
     }
+
+    /**
+     * @return Redirect
+     */
+    private function getResultRedirect(): Redirect
+    {
+        $resultRedirect = $this->resultRedirectFactory->create();
+        $resultRedirect->setPath('*/import');
+
+        return $resultRedirect;
+    }
 }
diff --git a/app/code/Magento/ImportExport/Model/Export.php b/app/code/Magento/ImportExport/Model/Export.php
index 9b0139ff911..695df18fd10 100644
--- a/app/code/Magento/ImportExport/Model/Export.php
+++ b/app/code/Magento/ImportExport/Model/Export.php
@@ -30,6 +30,8 @@ class Export extends \Magento\ImportExport\Model\AbstractModel
      */
     const FILTER_TYPE_SELECT = 'select';
 
+    const FILTER_TYPE_MULTISELECT = 'multiselect';
+
     const FILTER_TYPE_INPUT = 'input';
 
     const FILTER_TYPE_DATE = 'date';
@@ -65,6 +67,17 @@ class Export extends \Magento\ImportExport\Model\AbstractModel
      */
     protected $_exportAdapterFac;
 
+    /**
+     * @var array
+     */
+    private static $backendTypeToFilterMapper = [
+        'datetime' => self::FILTER_TYPE_DATE,
+        'decimal' => self::FILTER_TYPE_NUMBER,
+        'int' => self::FILTER_TYPE_NUMBER,
+        'varchar' => self::FILTER_TYPE_INPUT,
+        'text' => self::FILTER_TYPE_INPUT
+    ];
+
     /**
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Filesystem $filesystem
@@ -215,20 +228,21 @@ public function filterAttributeCollection(\Magento\Framework\Data\Collection $co
     public static function getAttributeFilterType(\Magento\Eav\Model\Entity\Attribute $attribute)
     {
         if ($attribute->usesSource() || $attribute->getFilterOptions()) {
-            return self::FILTER_TYPE_SELECT;
-        } elseif ('datetime' == $attribute->getBackendType()) {
-            return self::FILTER_TYPE_DATE;
-        } elseif ('decimal' == $attribute->getBackendType() || 'int' == $attribute->getBackendType()) {
-            return self::FILTER_TYPE_NUMBER;
-        } elseif ('varchar' == $attribute->getBackendType() || 'text' == $attribute->getBackendType()) {
-            return self::FILTER_TYPE_INPUT;
-        } elseif ($attribute->isStatic()) {
+            return 'multiselect' == $attribute->getFrontendInput() ?
+                self::FILTER_TYPE_MULTISELECT : self::FILTER_TYPE_SELECT;
+        }
+
+        if (isset(self::$backendTypeToFilterMapper[$attribute->getBackendType()])) {
+            return self::$backendTypeToFilterMapper[$attribute->getBackendType()];
+        }
+
+        if ($attribute->isStatic()) {
             return self::getStaticAttributeFilterType($attribute);
-        } else {
-            throw new \Magento\Framework\Exception\LocalizedException(
-                __('We can\'t determine the attribute filter type.')
-            );
         }
+
+        throw new \Magento\Framework\Exception\LocalizedException(
+            __('We can\'t determine the attribute filter type.')
+        );
     }
 
     /**
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
index 5ade67bbf89..df556e961d2 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
@@ -152,7 +152,6 @@ public function filterEntityCollection(AbstractCollection $collection)
             // filter applying
             if (isset($exportFilter[$attributeCode])) {
                 $attributeFilterType = Export::getAttributeFilterType($attribute);
-
                 if (Export::FILTER_TYPE_SELECT == $attributeFilterType) {
                     if (is_scalar($exportFilter[$attributeCode]) && trim($exportFilter[$attributeCode])) {
                         $collection->addAttributeToFilter(
@@ -160,6 +159,18 @@ public function filterEntityCollection(AbstractCollection $collection)
                             ['eq' => $exportFilter[$attributeCode]]
                         );
                     }
+                } elseif (Export::FILTER_TYPE_MULTISELECT == $attributeFilterType) {
+                    if (is_array($exportFilter[$attributeCode])) {
+                        array_filter($exportFilter[$attributeCode]);
+                        if (!empty($exportFilter[$attributeCode])) {
+                            foreach ($exportFilter[$attributeCode] as $val) {
+                                $collection->addAttributeToFilter(
+                                    $attributeCode,
+                                    ['finset' => $val]
+                                );
+                            }
+                        }
+                    }
                 } elseif (Export::FILTER_TYPE_INPUT == $attributeFilterType) {
                     if (is_scalar($exportFilter[$attributeCode]) && trim($exportFilter[$attributeCode])) {
                         $collection->addAttributeToFilter(
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
index 5cac5e46ffa..d9e3879b4be 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
@@ -277,6 +277,18 @@ protected function _prepareEntityCollection(\Magento\Eav\Model\Entity\Collection
                     if (is_scalar($exportFilter[$attrCode]) && trim($exportFilter[$attrCode])) {
                         $collection->addAttributeToFilter($attrCode, ['eq' => $exportFilter[$attrCode]]);
                     }
+                } elseif (\Magento\ImportExport\Model\Export::FILTER_TYPE_MULTISELECT == $attrFilterType) {
+                    if (is_array($exportFilter[$attrCode])) {
+                        array_filter($exportFilter[$attrCode]);
+                        if (!empty($exportFilter[$attrCode])) {
+                            foreach ($exportFilter[$attrCode] as $val) {
+                                $collection->addAttributeToFilter(
+                                    $attrCode,
+                                    ['finset' => $val]
+                                );
+                            }
+                        }
+                    }
                 } elseif (\Magento\ImportExport\Model\Export::FILTER_TYPE_INPUT == $attrFilterType) {
                     if (is_scalar($exportFilter[$attrCode]) && trim($exportFilter[$attrCode])) {
                         $collection->addAttributeToFilter($attrCode, ['like' => "%{$exportFilter[$attrCode]}%"]);
diff --git a/app/code/Magento/ImportExport/Model/Import/SampleFileProvider.php b/app/code/Magento/ImportExport/Model/Import/SampleFileProvider.php
new file mode 100644
index 00000000000..e69564a0eeb
--- /dev/null
+++ b/app/code/Magento/ImportExport/Model/Import/SampleFileProvider.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ImportExport\Model\Import;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Filesystem\Directory\ReadInterface;
+
+/**
+ * Import Sample File Provider model.
+ * This class support only *.csv.
+ */
+class SampleFileProvider
+{
+    /**
+     * Associate an import entity to its module, e.g ['entity_name' => 'module_name']
+     * @var array
+     */
+    private $samples;
+
+    /**
+     * @var \Magento\Framework\Component\ComponentRegistrar
+     */
+    private $componentRegistrar;
+
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\ReadFactory
+     */
+    private $readFactory;
+
+    /**
+     * @param \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory
+     * @param ComponentRegistrar $componentRegistrar
+     * @param array $samples
+     */
+    public function __construct(
+        \Magento\Framework\Filesystem\Directory\ReadFactory $readFactory,
+        \Magento\Framework\Component\ComponentRegistrar $componentRegistrar,
+        array $samples = []
+    ) {
+        $this->readFactory = $readFactory;
+        $this->componentRegistrar = $componentRegistrar;
+        $this->samples = $samples;
+    }
+
+    /**
+     * Returns the Size for the given file associated to an Import entity
+     *
+     * @param string $entityName
+     * @throws NoSuchEntityException
+     * @return int|null
+     */
+    public function getSize(string $entityName)
+    {
+        $directoryRead = $this->getDirectoryRead($entityName);
+        $filePath = $this->getPath($entityName);
+        $fileSize = isset($directoryRead->stat($filePath)['size'])
+            ? $directoryRead->stat($filePath)['size'] : null;
+
+        return $fileSize;
+    }
+
+    /**
+     * Returns Content for the given file associated to an Import entity
+     *
+     * @param string $entityName
+     * @throws NoSuchEntityException
+     * @return string
+     */
+    public function getFileContents(string $entityName): string
+    {
+        $directoryRead = $this->getDirectoryRead($entityName);
+        $filePath = $this->getPath($entityName);
+
+        return $directoryRead->readFile($filePath);
+    }
+
+    /**
+     * @return string $entityName
+     * @throws NoSuchEntityException
+     */
+    private function getPath(string $entityName): string
+    {
+        $moduleName = $this->getModuleName($entityName);
+        $directoryRead = $this->getDirectoryRead($entityName);
+        $moduleDir = $this->componentRegistrar->getPath(ComponentRegistrar::MODULE, $moduleName);
+        $fileAbsolutePath = $moduleDir . '/Files/Sample/' . $entityName . '.csv';
+
+        $filePath = $directoryRead->getRelativePath($fileAbsolutePath);
+
+        if (!$directoryRead->isFile($filePath)) {
+            throw new NoSuchEntityException(__("There is no file: %file", ['file' => $filePath]));
+        }
+
+        return $filePath;
+    }
+
+    /**
+     * @param string $entityName
+     * @return ReadInterface
+     */
+    private function getDirectoryRead(string $entityName): ReadInterface
+    {
+        $moduleName = $this->getModuleName($entityName);
+        $moduleDir = $this->componentRegistrar->getPath(ComponentRegistrar::MODULE, $moduleName);
+        $directoryRead = $this->readFactory->create($moduleDir);
+
+        return $directoryRead;
+    }
+
+    /**
+     * @param string $entityName
+     * @return string
+     * @throws NoSuchEntityException
+     */
+    private function getModuleName(string $entityName): string
+    {
+        if (!isset($this->samples[$entityName])) {
+            throw new NoSuchEntityException();
+        }
+
+        return $this->samples[$entityName];
+    }
+}
diff --git a/app/code/Magento/ImportExport/etc/di.xml b/app/code/Magento/ImportExport/etc/di.xml
index 47acf7a356d..36c76022a41 100644
--- a/app/code/Magento/ImportExport/etc/di.xml
+++ b/app/code/Magento/ImportExport/etc/di.xml
@@ -17,4 +17,16 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\ImportExport\Model\Import\SampleFileProvider">
+        <arguments>
+            <argument name="samples" xsi:type="array">
+                <item name="advanced_pricing" xsi:type="string">Magento_ImportExport</item>
+                <item name="catalog_product" xsi:type="string">Magento_ImportExport</item>
+                <item name="customer" xsi:type="string">Magento_ImportExport</item>
+                <item name="customer_address" xsi:type="string">Magento_ImportExport</item>
+                <item name="customer_composite" xsi:type="string">Magento_ImportExport</item>
+                <item name="customer_finance" xsi:type="string">Magento_ImportExport</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Indexer/Model/Indexer.php b/app/code/Magento/Indexer/Model/Indexer.php
index 9faf5e7b728..58b2e9ed76a 100644
--- a/app/code/Magento/Indexer/Model/Indexer.php
+++ b/app/code/Magento/Indexer/Model/Indexer.php
@@ -8,7 +8,7 @@
 use Magento\Framework\Indexer\ActionFactory;
 use Magento\Framework\Indexer\ActionInterface;
 use Magento\Framework\Indexer\ConfigInterface;
-use Magento\Framework\Indexer\IndexerInterface as IdxInterface;
+use Magento\Framework\Indexer\IndexerInterface;
 use Magento\Framework\Indexer\IndexStructureInterface;
 use Magento\Framework\Indexer\StateInterface;
 use Magento\Framework\Indexer\StructureFactory;
@@ -16,7 +16,7 @@
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Indexer extends \Magento\Framework\DataObject implements IdxInterface
+class Indexer extends \Magento\Framework\DataObject implements IndexerInterface
 {
     /**
      * @var string
@@ -211,7 +211,7 @@ public function getHandlers()
      * Fill indexer data from config
      *
      * @param string $indexerId
-     * @return IdxInterface
+     * @return IndexerInterface
      * @throws \InvalidArgumentException
      */
     public function load($indexerId)
@@ -258,7 +258,7 @@ public function getState()
      * Set indexer state object
      *
      * @param StateInterface $state
-     * @return IdxInterface
+     * @return IndexerInterface
      */
     public function setState(StateInterface $state)
     {
@@ -368,6 +368,7 @@ public function getLatestUpdated()
      * Return indexer action instance
      *
      * @return ActionInterface
+     * @throws \InvalidArgumentException
      */
     protected function getActionInstance()
     {
diff --git a/app/code/Magento/InstantPurchase/CustomerData/InstantPurchase.php b/app/code/Magento/InstantPurchase/CustomerData/InstantPurchase.php
index 3d9c06e76ea..7ded5373dc7 100644
--- a/app/code/Magento/InstantPurchase/CustomerData/InstantPurchase.php
+++ b/app/code/Magento/InstantPurchase/CustomerData/InstantPurchase.php
@@ -30,7 +30,7 @@ class InstantPurchase implements SectionSourceInterface
     private $customerSession;
 
     /**
-     * @var StoreManagerInterface\
+     * @var StoreManagerInterface
      */
     private $storeManager;
 
diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/LoginSuccessCallback.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/LoginSuccessCallback.php
index d53564630ae..0e171fb6f36 100644
--- a/app/code/Magento/Integration/Controller/Adminhtml/Integration/LoginSuccessCallback.php
+++ b/app/code/Magento/Integration/Controller/Adminhtml/Integration/LoginSuccessCallback.php
@@ -15,6 +15,6 @@ class LoginSuccessCallback extends \Magento\Integration\Controller\Adminhtml\Int
      */
     public function execute()
     {
-        $this->getResponse()->setBody('<script>setTimeout("self.close()",1000);</script>');
+        $this->getResponse()->setBody('<script>setTimeout(self.close.bind(this), 1000);</script>');
     }
 }
diff --git a/app/code/Magento/Integration/i18n/en_US.csv b/app/code/Magento/Integration/i18n/en_US.csv
index 6fb5d2e0712..b225ad2766f 100644
--- a/app/code/Magento/Integration/i18n/en_US.csv
+++ b/app/code/Magento/Integration/i18n/en_US.csv
@@ -93,7 +93,7 @@ Reset,Reset
 "A token with consumer ID 0 does not exist","A token with consumer ID 0 does not exist"
 "The integration you selected asks you to approve access to the following:","The integration you selected asks you to approve access to the following:"
 "No permissions requested","No permissions requested"
-"Are you sure ?","Are you sure ?"
+"Are you sure?","Are you sure?"
 "Are you sure you want to delete this integration? You can't undo this action.","Are you sure you want to delete this integration? You can't undo this action."
 "Please setup or sign in into your 3rd party account to complete setup of this integration.","Please setup or sign in into your 3rd party account to complete setup of this integration."
 "Available APIs","Available APIs"
diff --git a/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml b/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml
index 6faeee56ba6..8b7e787337e 100644
--- a/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml
+++ b/app/code/Magento/Integration/view/adminhtml/templates/integration/popup_container.phtml
@@ -33,8 +33,8 @@
             $('div#integrationGrid').on('click', 'button#delete', function (e) {
 
                 new Confirm({
-                    title: 'Are you sure?',
-                    content: "Are you sure you want to delete this integration? You can't undo this action.",
+                    title: '<?= /* @escapeNotVerified */ __('Are you sure?') ?>',
+                    content: "<?= /* @escapeNotVerified */ __("Are you sure you want to delete this integration? You can't undo this action.") ?>",
                     actions: {
                         confirm: function () {
                             window.location.href = $(e.target).data('url');
@@ -47,14 +47,4 @@
     });
 </script>
 
-<div id="integration-popup-container" style="display: none;"></div>
-<div id="integration-delete-container"
-     class="messages"
-     style="display: none;"
-     title="<?= /* @escapeNotVerified */ __('Are you sure ?') ?>">
-    <div class="message message-notice notice">
-        <div>
-            <?= /* @escapeNotVerified */ __("Are you sure you want to delete this integration? You can't undo this action.") ?>
-        </div>
-    </div>
-</div>
+<div id="integration-popup-container" style="display: none;"></div>
\ No newline at end of file
diff --git a/app/code/Magento/MessageQueue/etc/di.xml b/app/code/Magento/MessageQueue/etc/di.xml
index de9d2b02693..c8f2edb8626 100644
--- a/app/code/Magento/MessageQueue/etc/di.xml
+++ b/app/code/Magento/MessageQueue/etc/di.xml
@@ -6,7 +6,7 @@
  */
 -->
 <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\ConfigInterface" type="Magento\Framework\MessageQueue\Config\Proxy" />
     <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" />
@@ -16,8 +16,8 @@
     <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>
+                <item name="startConsumerCommand" xsi:type="object">Magento\MessageQueue\Console\StartConsumerCommand\Proxy</item>
+                <item name="consumerListCommand" xsi:type="object">Magento\MessageQueue\Console\ConsumerListCommand\Proxy</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php b/app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php
index e6ef9db3eb6..7a8419d57c8 100644
--- a/app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php
+++ b/app/code/Magento/NewRelicReporting/Console/Command/DeployMarker.php
@@ -48,21 +48,21 @@ protected function configure()
     {
         $this->setName("newrelic:create:deploy-marker");
         $this->setDescription("Check the deploy queue for entries and create an appropriate deploy marker.")
-             ->addArgument(
-                 'message',
-                 InputArgument::REQUIRED,
-                 'Deploy Message?'
-             )
-             ->addArgument(
-                 'change_log',
-                 InputArgument::REQUIRED,
-                 'Change Log?'
-             )
-             ->addArgument(
-                 'user',
-                 InputArgument::OPTIONAL,
-                 'Deployment User'
-             );
+            ->addArgument(
+                'message',
+                InputArgument::REQUIRED,
+                'Deploy Message?'
+            )
+            ->addArgument(
+                'change_log',
+                InputArgument::REQUIRED,
+                'Change Log?'
+            )
+            ->addArgument(
+                'user',
+                InputArgument::OPTIONAL,
+                'Deployment User'
+            );
         parent::configure();
     }
 
diff --git a/app/code/Magento/PageCache/etc/varnish4.vcl b/app/code/Magento/PageCache/etc/varnish4.vcl
index 9e57f1e3623..f6b7859af7c 100644
--- a/app/code/Magento/PageCache/etc/varnish4.vcl
+++ b/app/code/Magento/PageCache/etc/varnish4.vcl
@@ -187,6 +187,13 @@ sub vcl_deliver {
         unset resp.http.Age;
     }
 
+    # Not letting browser to cache non-static files.
+    if (resp.http.Cache-Control !~ "private" && req.url !~ "^/(pub/)?(media|static)/") {
+        set resp.http.Pragma = "no-cache";
+        set resp.http.Expires = "-1";
+        set resp.http.Cache-Control = "no-store, no-cache, must-revalidate, max-age=0";
+    }
+
     unset resp.http.X-Magento-Debug;
     unset resp.http.X-Magento-Tags;
     unset resp.http.X-Powered-By;
diff --git a/app/code/Magento/PageCache/etc/varnish5.vcl b/app/code/Magento/PageCache/etc/varnish5.vcl
index cfc21926887..388157af184 100644
--- a/app/code/Magento/PageCache/etc/varnish5.vcl
+++ b/app/code/Magento/PageCache/etc/varnish5.vcl
@@ -188,6 +188,13 @@ sub vcl_deliver {
         unset resp.http.Age;
     }
 
+    # Not letting browser to cache non-static files.
+    if (resp.http.Cache-Control !~ "private" && req.url !~ "^/(pub/)?(media|static)/") {
+        set resp.http.Pragma = "no-cache";
+        set resp.http.Expires = "-1";
+        set resp.http.Cache-Control = "no-store, no-cache, must-revalidate, max-age=0";
+    }
+
     unset resp.http.X-Magento-Debug;
     unset resp.http.X-Magento-Tags;
     unset resp.http.X-Powered-By;
diff --git a/app/code/Magento/Paypal/Model/Config.php b/app/code/Magento/Paypal/Model/Config.php
index 64a2a294335..34e40ac7509 100644
--- a/app/code/Magento/Paypal/Model/Config.php
+++ b/app/code/Magento/Paypal/Model/Config.php
@@ -224,6 +224,7 @@ class Config extends AbstractConfig
         'TWD',
         'THB',
         'USD',
+        'INR',
     ];
 
     /**
diff --git a/app/code/Magento/ProductAlert/Model/Observer.php b/app/code/Magento/ProductAlert/Model/Observer.php
index df046c4e4af..1870989f11d 100644
--- a/app/code/Magento/ProductAlert/Model/Observer.php
+++ b/app/code/Magento/ProductAlert/Model/Observer.php
@@ -113,6 +113,11 @@ class Observer
      */
     protected $inlineTranslation;
 
+    /**
+     * @var ProductSalability
+     */
+    protected $productSalability;
+
     /**
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -125,6 +130,7 @@ class Observer
      * @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
      * @param \Magento\ProductAlert\Model\EmailFactory $emailFactory
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
+     * @param ProductSalability|null $productSalability
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -138,7 +144,8 @@ public function __construct(
         \Magento\ProductAlert\Model\ResourceModel\Stock\CollectionFactory $stockColFactory,
         \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
         \Magento\ProductAlert\Model\EmailFactory $emailFactory,
-        \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
+        \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
+        ProductSalability $productSalability = null
     ) {
         $this->_catalogData = $catalogData;
         $this->_scopeConfig = $scopeConfig;
@@ -151,6 +158,8 @@ public function __construct(
         $this->_transportBuilder = $transportBuilder;
         $this->_emailFactory = $emailFactory;
         $this->inlineTranslation = $inlineTranslation;
+        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+        $this->productSalability = $productSalability ?: $objectManager->get(ProductSalability::class);
     }
 
     /**
@@ -326,7 +335,7 @@ protected function _processStock(\Magento\ProductAlert\Model\Email $email)
 
                     $product->setCustomerGroupId($customer->getGroupId());
 
-                    if ($product->isSalable()) {
+                    if ($this->productSalability->isSalable($product, $website)) {
                         $email->addStockProduct($product);
 
                         $alert->setSendDate($this->_dateFactory->create()->gmtDate());
diff --git a/app/code/Magento/ProductAlert/Model/ProductSalability.php b/app/code/Magento/ProductAlert/Model/ProductSalability.php
new file mode 100644
index 00000000000..dffb69ee092
--- /dev/null
+++ b/app/code/Magento/ProductAlert/Model/ProductSalability.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ProductAlert\Model;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Store\Api\Data\WebsiteInterface;
+
+/**
+ * Checks product salability
+ */
+class ProductSalability
+{
+    /**
+     * @param ProductInterface $product
+     * @param WebsiteInterface $website
+     * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function isSalable(ProductInterface $product, WebsiteInterface $website): bool
+    {
+        return $product->isSalable();
+    }
+}
diff --git a/app/code/Magento/ProductAlert/Test/Unit/Model/ObserverTest.php b/app/code/Magento/ProductAlert/Test/Unit/Model/ObserverTest.php
index 54376caa653..9cd8546a018 100644
--- a/app/code/Magento/ProductAlert/Test/Unit/Model/ObserverTest.php
+++ b/app/code/Magento/ProductAlert/Test/Unit/Model/ObserverTest.php
@@ -6,6 +6,7 @@
 namespace Magento\ProductAlert\Test\Unit\Model;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\ProductAlert\Model\ProductSalability;
 
 /**
  * Class ObserverTest
@@ -109,6 +110,11 @@ class ObserverTest extends \PHPUnit\Framework\TestCase
      */
     private $objectManagerMock;
 
+    /**
+     * @var ProductSalability|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productSalabilityMock;
+
     protected function setUp()
     {
         $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
@@ -170,10 +176,11 @@ protected function setUp()
                 [
                     'setCustomerGroupId',
                     'getFinalPrice',
-                    'isSalable',
                 ]
             )->getMock();
 
+        $this->productSalabilityMock = $this->createPartialMock(ProductSalability::class, ['isSalable']);
+
         $this->objectManager = new ObjectManager($this);
         $this->observer = $this->objectManager->getObject(
             \Magento\ProductAlert\Model\Observer::class,
@@ -187,7 +194,8 @@ protected function setUp()
                 'priceColFactory' => $this->priceColFactoryMock,
                 'stockColFactory' => $this->stockColFactoryMock,
                 'customerRepository' => $this->customerRepositoryMock,
-                'productRepository' => $this->productRepositoryMock
+                'productRepository' => $this->productRepositoryMock,
+                'productSalability' => $this->productSalabilityMock
             ]
         );
     }
@@ -391,7 +399,7 @@ public function testProcessStockEmailThrowsException()
         $this->customerRepositoryMock->expects($this->once())->method('getById')->willReturn($customer);
 
         $this->productMock->expects($this->once())->method('setCustomerGroupId')->willReturnSelf();
-        $this->productMock->expects($this->once())->method('isSalable')->willReturn(false);
+        $this->productSalabilityMock->expects($this->once())->method('isSalable')->willReturn(false);
         $this->productRepositoryMock->expects($this->once())->method('getById')->willReturn($this->productMock);
 
         $this->emailMock->expects($this->once())->method('send')->willThrowException(new \Exception());
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php
index d77f30a0046..c77ff5c26b0 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Sales.php
@@ -56,9 +56,6 @@ protected function _isAllowed()
             case 'coupons':
                 return $this->_authorization->isAllowed('Magento_Reports::coupons');
                 break;
-            case 'shipping':
-                return $this->_authorization->isAllowed('Magento_Reports::shipping');
-                break;
             case 'bestsellers':
                 return $this->_authorization->isAllowed('Magento_Reports::bestsellers');
                 break;
diff --git a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
index cb267ce29dd..00766acac16 100644
--- a/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
+++ b/app/code/Magento/Reports/view/adminhtml/templates/grid.phtml
@@ -31,7 +31,7 @@ $numColumns = sizeof($block->getColumns());
                                        type="text"
                                        id="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from') ?>"
                                        name="report_from"
-                                       value="<?= /* @escapeNotVerified */ $block->getFilter('report_from') ?>">
+                                       value="<?= $block->escapeHtml($block->getFilter('report_from')) ?>">
                                 <span id="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_from_advice') ?>"></span>
                             </span>
 
@@ -44,7 +44,7 @@ $numColumns = sizeof($block->getColumns());
                                        type="text"
                                        id="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to') ?>"
                                        name="report_to"
-                                       value="<?= /* @escapeNotVerified */ $block->getFilter('report_to') ?>"/>
+                                       value="<?= $block->escapeHtml($block->getFilter('report_to')) ?>"/>
                                 <span id="<?= /* @escapeNotVerified */ $block->getSuffixId('period_date_to_advice') ?>"></span>
                             </span>
 
diff --git a/app/code/Magento/Review/etc/adminhtml/menu.xml b/app/code/Magento/Review/etc/adminhtml/menu.xml
index 2ed92a48ad4..e3532483f88 100644
--- a/app/code/Magento/Review/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Review/etc/adminhtml/menu.xml
@@ -9,7 +9,7 @@
     <menu>
         <add id="Magento_Review::catalog_reviews_ratings_ratings" title="Rating" translate="title" module="Magento_Review" sortOrder="60" parent="Magento_Backend::stores_attributes" action="review/rating/" resource="Magento_Review::ratings"/>
         <add id="Magento_Review::catalog_reviews_ratings_reviews_all" title="Reviews" translate="title" module="Magento_Review" parent="Magento_Backend::marketing_user_content" sortOrder="10" action="review/product/index" resource="Magento_Review::reviews_all"/>
-    <add id="Magento_Review::report_review" title="Reviews" translate="title" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report" resource="Magento_Reports::review"/>
+        <add id="Magento_Review::report_review" title="Reviews" translate="title" module="Magento_Reports" sortOrder="20" parent="Magento_Reports::report" resource="Magento_Reports::review"/>
         <add id="Magento_Review::report_review_customer" title="By Customers" translate="title" sortOrder="10" module="Magento_Review" parent="Magento_Review::report_review" action="reports/report_review/customer" resource="Magento_Reports::review_customer"/>
         <add id="Magento_Review::report_review_product" title="By Products" translate="title" sortOrder="20" module="Magento_Review" parent="Magento_Review::report_review" action="reports/report_review/product" resource="Magento_Reports::review_product"/>
     </menu>
diff --git a/app/code/Magento/Sales/Helper/Guest.php b/app/code/Magento/Sales/Helper/Guest.php
index dd8845008d7..8407ce5a8d7 100644
--- a/app/code/Magento/Sales/Helper/Guest.php
+++ b/app/code/Magento/Sales/Helper/Guest.php
@@ -83,7 +83,7 @@ class Guest extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * @var \Magento\Store\Model\StoreManagerInterface
      */
-    private $_storeManager;
+    private $storeManager;
 
     /**
      * @var string
@@ -119,7 +119,7 @@ public function __construct(
         \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteria = null
     ) {
         $this->coreRegistry = $coreRegistry;
-        $this->_storeManager = $storeManager;
+        $this->storeManager = $storeManager;
         $this->customerSession = $customerSession;
         $this->cookieManager = $cookieManager;
         $this->cookieMetadataFactory = $cookieMetadataFactory;
@@ -158,9 +158,10 @@ public function loadValidOrder(App\RequestInterface $request)
         // It is unique place in the class that process exception and only InputException. It is need because by
         // input data we found order and one more InputException could be throws deeper in stack trace
         try {
-            $order = (!empty($post) && isset($post['oar_order_id'], $post['oar_type']))
+            $order = (!empty($post)
+                && isset($post['oar_order_id'], $post['oar_type'])
+                && !$this->hasPostDataEmptyFields($post))
                 ? $this->loadFromPost($post) : $this->loadFromCookie($fromCookie);
-            $this->validateOrderStoreId($order->getStoreId());
             $this->coreRegistry->register('current_order', $order);
             return true;
         } catch (InputException $e) {
@@ -186,7 +187,7 @@ public function getBreadcrumbs(\Magento\Framework\View\Result\Page $resultPage)
             [
                 'label' => __('Home'),
                 'title' => __('Go to Home Page'),
-                'link' => $this->_storeManager->getStore()->getBaseUrl()
+                'link' => $this->storeManager->getStore()->getBaseUrl()
             ]
         );
         $breadcrumbs->addCrumb(
@@ -247,12 +248,9 @@ private function loadFromCookie($fromCookie)
      */
     private function loadFromPost(array $postData)
     {
-        if ($this->hasPostDataEmptyFields($postData)) {
-            throw new InputException();
-        }
         /** @var $order \Magento\Sales\Model\Order */
         $order = $this->getOrderRecord($postData['oar_order_id']);
-        if (!$this->compareSoredBillingDataWithInput($order, $postData)) {
+        if (!$this->compareStoredBillingDataWithInput($order, $postData)) {
             throw new InputException(__('You entered incorrect data. Please try again.'));
         }
         $toCookie = base64_encode($order->getProtectCode() . ':' . $postData['oar_order_id']);
@@ -267,7 +265,7 @@ private function loadFromPost(array $postData)
      * @param array $postData
      * @return bool
      */
-    private function compareSoredBillingDataWithInput(Order $order, array $postData)
+    private function compareStoredBillingDataWithInput(Order $order, array $postData)
     {
         $type = $postData['oar_type'];
         $email = $postData['oar_email'];
@@ -288,7 +286,7 @@ private function compareSoredBillingDataWithInput(Order $order, array $postData)
     private function hasPostDataEmptyFields(array $postData)
     {
         return empty($postData['oar_order_id']) || empty($postData['oar_billing_lastname']) ||
-            empty($postData['oar_type']) || empty($this->_storeManager->getStore()->getId()) ||
+            empty($postData['oar_type']) || empty($this->storeManager->getStore()->getId()) ||
             !in_array($postData['oar_type'], ['email', 'zip'], true) ||
             ('email' === $postData['oar_type'] && empty($postData['oar_email'])) ||
             ('zip' === $postData['oar_type'] && empty($postData['oar_zip']));
@@ -306,26 +304,15 @@ private function getOrderRecord($incrementId)
         $records = $this->orderRepository->getList(
             $this->searchCriteriaBuilder
                 ->addFilter('increment_id', $incrementId)
+                ->addFilter('store_id', $this->storeManager->getStore()->getId())
                 ->create()
         );
-        if ($records->getTotalCount() < 1) {
-            throw new InputException(__($this->inputExceptionMessage));
-        }
-        $items = $records->getItems();
-        return array_shift($items);
-    }
 
-    /**
-     * Check that store_id from order are equals with system
-     *
-     * @param int $orderStoreId
-     * @return void
-     * @throws InputException
-     */
-    private function validateOrderStoreId($orderStoreId)
-    {
-        if ($orderStoreId != $this->_storeManager->getStore()->getId()) {
+        $items = $records->getItems();
+        if (empty($items)) {
             throw new InputException(__($this->inputExceptionMessage));
         }
+
+        return array_shift($items);
     }
 }
diff --git a/app/code/Magento/Sales/Model/Order/Shipment.php b/app/code/Magento/Sales/Model/Order/Shipment.php
index 64e20d5a690..e23d7eaef2f 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment.php
@@ -324,7 +324,10 @@ public function addItem(\Magento\Sales\Model\Order\Shipment\Item $item)
     {
         $item->setShipment($this)->setParentId($this->getId())->setStoreId($this->getStoreId());
         if (!$item->getId()) {
-            $this->getItemsCollection()->addItem($item);
+            $this->setItems(array_merge(
+                $this->getItems() ?? [],
+                [$item]
+            ));
         }
         return $this;
     }
@@ -535,7 +538,11 @@ public function getItems()
                 $this->setData(ShipmentInterface::ITEMS, $collection->getItems());
             }
         }
-        return $this->getData(ShipmentInterface::ITEMS);
+        $shipmentItems = $this->getData(ShipmentInterface::ITEMS);
+        if ($shipmentItems !== null && !is_array($shipmentItems)) {
+            $shipmentItems = $shipmentItems->getItems();
+        }
+        return $shipmentItems;
     }
 
     /**
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Item.php b/app/code/Magento/Sales/Model/Order/Shipment/Item.php
index 342fd3fa8f2..0da936e74ca 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Item.php
@@ -144,7 +144,7 @@ public function getOrderItem()
      * Declare qty
      *
      * @param float $qty
-     * @return \Magento\Sales\Model\Order\Invoice\Item
+     * @return \Magento\Sales\Model\Order\Shipment\Item
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function setQty($qty)
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Order/TotalsTest.php b/app/code/Magento/Sales/Test/Unit/Block/Order/TotalsTest.php
index 7ad21f26a8b..a8ce2ad4ff0 100644
--- a/app/code/Magento/Sales/Test/Unit/Block/Order/TotalsTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Block/Order/TotalsTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Test\Unit\Block\Order;
 
 use Magento\Framework\Registry;
diff --git a/app/code/Magento/Sales/etc/adminhtml/system.xml b/app/code/Magento/Sales/etc/adminhtml/system.xml
index 8f004d9ad59..6261353332c 100644
--- a/app/code/Magento/Sales/etc/adminhtml/system.xml
+++ b/app/code/Magento/Sales/etc/adminhtml/system.xml
@@ -106,7 +106,7 @@
                     <comment>We'll use the default error above if you leave this empty.</comment>
                 </field>
             </group>
-            <group id="dashboard" translate="label,comment" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0">
+            <group id="dashboard" translate="label comment" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Dashboard</label>
                 <field id="use_aggregated_data" translate="label" sortOrder="10" type="select" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Use Aggregated Data</label>
@@ -114,7 +114,7 @@
                     <comment>Improves dashboard performance but provides non-realtime data.</comment>
                 </field>
             </group>
-            <group id="orders" translate="label,comment" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0">
+            <group id="orders" translate="label comment" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="0">
                 <label>Orders Cron Settings</label>
                 <field id="delete_pending_after" translate="label" type="text" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Pending Payment Order Lifetime (minutes)</label>
diff --git a/app/code/Magento/Search/view/frontend/web/form-mini.js b/app/code/Magento/Search/view/frontend/web/form-mini.js
index 1811274af01..de16305bbbe 100644
--- a/app/code/Magento/Search/view/frontend/web/form-mini.js
+++ b/app/code/Magento/Search/view/frontend/web/form-mini.js
@@ -206,13 +206,17 @@ define([
 
             switch (keyCode) {
                 case $.ui.keyCode.HOME:
-                    this._getFirstVisibleElement().addClass(this.options.selectClass);
-                    this.responseList.selected = this._getFirstVisibleElement();
+                    if (this._getFirstVisibleElement()) {
+                        this._getFirstVisibleElement().addClass(this.options.selectClass);
+                        this.responseList.selected = this._getFirstVisibleElement();
+                    }
                     break;
 
                 case $.ui.keyCode.END:
-                    this._getLastElement().addClass(this.options.selectClass);
-                    this.responseList.selected = this._getLastElement();
+                    if (this._getLastElement()) {
+                        this._getLastElement().addClass(this.options.selectClass);
+                        this.responseList.selected = this._getLastElement();
+                    }
                     break;
 
                 case $.ui.keyCode.ESCAPE:
diff --git a/app/code/Magento/Store/Api/Data/WebsiteInterface.php b/app/code/Magento/Store/Api/Data/WebsiteInterface.php
index fc1c38de0f5..27519e5b0bc 100644
--- a/app/code/Magento/Store/Api/Data/WebsiteInterface.php
+++ b/app/code/Magento/Store/Api/Data/WebsiteInterface.php
@@ -13,6 +13,11 @@
  */
 interface WebsiteInterface extends \Magento\Framework\Api\ExtensibleDataInterface
 {
+    /**
+     * contains code of admin website
+     */
+    const ADMIN_CODE = 'admin';
+
     /**
      * @return int
      */
diff --git a/app/code/Magento/Store/Block/Switcher.php b/app/code/Magento/Store/Block/Switcher.php
index 074dcb02620..b0659b7caf7 100644
--- a/app/code/Magento/Store/Block/Switcher.php
+++ b/app/code/Magento/Store/Block/Switcher.php
@@ -10,7 +10,9 @@
 namespace Magento\Store\Block;
 
 use Magento\Directory\Helper\Data;
+use Magento\Store\Api\StoreResolverInterface;
 use Magento\Store\Model\Group;
+use Magento\Store\Model\Store;
 
 /**
  * @api
@@ -217,15 +219,18 @@ public function getStoreName()
     /**
      * Returns target store post data
      *
-     * @param \Magento\Store\Model\Store $store
+     * @param Store $store
      * @param array $data
      * @return string
      */
-    public function getTargetStorePostData(\Magento\Store\Model\Store $store, $data = [])
+    public function getTargetStorePostData(Store $store, $data = [])
     {
-        $data[\Magento\Store\Api\StoreResolverInterface::PARAM_NAME] = $store->getCode();
+        $data[StoreResolverInterface::PARAM_NAME] = $store->getCode();
+
+        //We need to set fromStore argument as true because
+        //it will enable proper URL rewriting during store switching.
         return $this->_postDataHelper->getPostData(
-            $store->getCurrentUrl(false),
+            $store->getCurrentUrl(true),
             $data
         );
     }
diff --git a/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php b/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php
index 5b3a74d5d8d..fb23e842a38 100644
--- a/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php
+++ b/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php
@@ -138,11 +138,11 @@ public function joinGroupAndStore()
             $this->getSelect()->joinLeft(
                 ['group_table' => $this->getTable('store_group')],
                 'main_table.website_id = group_table.website_id',
-                ['group_id' => 'group_id', 'group_title' => 'name']
+                ['group_id' => 'group_id', 'group_title' => 'name', 'group_code' => 'code']
             )->joinLeft(
                 ['store_table' => $this->getTable('store')],
                 'group_table.group_id = store_table.group_id',
-                ['store_id' => 'store_id', 'store_title' => 'name']
+                ['store_id' => 'store_id', 'store_title' => 'name', 'store_code' => 'code']
             );
             $this->addOrder('group_table.name', \Magento\Framework\DB\Select::SQL_ASC)       // store name
                 ->addOrder(
diff --git a/app/code/Magento/Store/Model/StoreDimensionProvider.php b/app/code/Magento/Store/Model/StoreDimensionProvider.php
new file mode 100644
index 00000000000..5bc019ea683
--- /dev/null
+++ b/app/code/Magento/Store/Model/StoreDimensionProvider.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Store\Model;
+
+use Magento\Framework\Indexer\DimensionFactory;
+use Magento\Framework\Indexer\Dimension\DimensionProviderInterface;
+
+/**
+ * Provide a list of stores as Dimension
+ */
+class StoreDimensionProvider implements DimensionProviderInterface
+{
+    /**
+     * Hold the name of Store dimension. Uses for retrieve dimension value.
+     * Used "scope" name for support current indexer implementation
+     */
+    const DIMENSION_NAME = 'scope';
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var DimensionFactory
+     */
+    private $dimensionFactory;
+
+    /**
+     * @param StoreManagerInterface $storeManager
+     * @param DimensionFactory $dimensionFactory
+     */
+    public function __construct(StoreManagerInterface $storeManager, DimensionFactory $dimensionFactory)
+    {
+        $this->storeManager = $storeManager;
+        $this->dimensionFactory = $dimensionFactory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getIterator(): \Traversable
+    {
+        foreach (array_keys($this->storeManager->getStores()) as $storeId) {
+            yield [self::DIMENSION_NAME => $this->dimensionFactory->create(self::DIMENSION_NAME, $storeId)];
+        }
+    }
+}
diff --git a/app/code/Magento/Store/Setup/Patch/Schema/InitializeStoresAndWebsites.php b/app/code/Magento/Store/Setup/Patch/Schema/InitializeStoresAndWebsites.php
index a282f2c21ef..05e46e04b5c 100644
--- a/app/code/Magento/Store/Setup/Patch/Schema/InitializeStoresAndWebsites.php
+++ b/app/code/Magento/Store/Setup/Patch/Schema/InitializeStoresAndWebsites.php
@@ -10,6 +10,7 @@
 use Magento\Framework\Setup\SchemaSetupInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 use Magento\Framework\Setup\Patch\SchemaPatchInterface;
+use Magento\Store\Api\Data\WebsiteInterface;
 
 /**
  * Create stores and websites. Actually stores and websites are part of schema as
@@ -64,7 +65,7 @@ public function apply()
                 $this->schemaSetup->getTable('store_website'),
                 [
                     'website_id' => 0,
-                    'code' => 'admin',
+                    'code' => WebsiteInterface::ADMIN_CODE,
                     'name' => 'Admin',
                     'sort_order' => 0,
                     'default_group_id' => 0,
diff --git a/app/code/Magento/Store/Test/Unit/Block/SwitcherTest.php b/app/code/Magento/Store/Test/Unit/Block/SwitcherTest.php
index 5f0ba6c0b42..8b4799d2b34 100644
--- a/app/code/Magento/Store/Test/Unit/Block/SwitcherTest.php
+++ b/app/code/Magento/Store/Test/Unit/Block/SwitcherTest.php
@@ -53,7 +53,7 @@ public function testGetTargetStorePostData()
         $storeSwitchUrl = 'http://domain.com/stores/store/switch';
         $store->expects($this->atLeastOnce())
             ->method('getCurrentUrl')
-            ->with(false)
+            ->with(true)
             ->willReturn($storeSwitchUrl);
         $this->corePostDataHelper->expects($this->any())
             ->method('getPostData')
diff --git a/app/code/Magento/Swagger/Api/Data/SchemaTypeInterface.php b/app/code/Magento/Swagger/Api/Data/SchemaTypeInterface.php
new file mode 100644
index 00000000000..f1bc6fcc105
--- /dev/null
+++ b/app/code/Magento/Swagger/Api/Data/SchemaTypeInterface.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Swagger\Api\Data;
+
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * Swagger Schema Type.
+ *
+ * @api
+ */
+interface SchemaTypeInterface extends ArgumentInterface
+{
+    /**
+     * Retrieve the available types of Swagger schema.
+     *
+     * @return string
+     */
+    public function getCode();
+
+    /**
+     * Get the URL path for the Swagger schema.
+     *
+     * @param  string|null $store
+     * @return string
+     */
+    public function getSchemaUrlPath($store = null);
+}
diff --git a/app/code/Magento/Swagger/Block/Index.php b/app/code/Magento/Swagger/Block/Index.php
index 91b67fe4e7f..549495190ef 100644
--- a/app/code/Magento/Swagger/Block/Index.php
+++ b/app/code/Magento/Swagger/Block/Index.php
@@ -5,12 +5,18 @@
  */
 namespace Magento\Swagger\Block;
 
+use Magento\Framework\Phrase;
 use Magento\Framework\View\Element\Template;
+use Magento\Swagger\Api\Data\SchemaTypeInterface;
 
 /**
  * Block for swagger index page
  *
  * @api
+ *
+ * @method SchemaTypeInterface[] getSchemaTypes()
+ * @method bool hasSchemaTypes()
+ * @method string getDefaultSchemaTypeCode()
  */
 class Index extends Template
 {
@@ -23,10 +29,38 @@ private function getParamStore()
     }
 
     /**
-     * @return string
+     * @return SchemaTypeInterface|null
+     */
+    private function getSchemaType()
+    {
+        if (!$this->hasSchemaTypes()) {
+            return null;
+        }
+
+        $schemaTypeCode = $this->getRequest()->getParam(
+            'type',
+            $this->getDefaultSchemaTypeCode()
+        );
+
+        if (!array_key_exists($schemaTypeCode, $this->getSchemaTypes())) {
+            throw new \UnexpectedValueException(
+                new Phrase('Unknown schema type supplied')
+            );
+        }
+
+        return $this->getSchemaTypes()[$schemaTypeCode];
+    }
+
+    /**
+     * @return string|null
      */
     public function getSchemaUrl()
     {
-        return rtrim($this->getBaseUrl(), '/') . '/rest/' . $this->getParamStore() . '/schema?services=all';
+        if ($this->getSchemaType() === null) {
+            return null;
+        }
+
+        return rtrim($this->getBaseUrl(), '/') .
+            $this->getSchemaType()->getSchemaUrlPath($this->getParamStore());
     }
 }
diff --git a/app/code/Magento/Swagger/Controller/Index/Index.php b/app/code/Magento/Swagger/Controller/Index/Index.php
index e10a9235c41..162367aaf81 100644
--- a/app/code/Magento/Swagger/Controller/Index/Index.php
+++ b/app/code/Magento/Swagger/Controller/Index/Index.php
@@ -7,6 +7,7 @@
 
 /**
  * Class Index
+ *
  * @package Magento\Swagger\Controller\Index
  */
 class Index extends \Magento\Framework\App\Action\Action
diff --git a/app/code/Magento/Swagger/Test/Unit/Block/IndexTest.php b/app/code/Magento/Swagger/Test/Unit/Block/IndexTest.php
new file mode 100644
index 00000000000..df35e0807a6
--- /dev/null
+++ b/app/code/Magento/Swagger/Test/Unit/Block/IndexTest.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Swagger\Test\Unit\Block;
+
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Swagger\Api\Data\SchemaTypeInterface;
+use Magento\Swagger\Block\Index;
+use Magento\SwaggerWebapi\Model\SchemaType\Rest;
+
+class IndexTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var SchemaTypeInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $schemaTypeMock;
+
+    /**
+     * @var RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var Index
+     */
+    private $index;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->requestMock = $this->getMockBuilder(RequestInterface::class)->getMock();
+        $this->schemaTypeMock = $this->getMockBuilder(SchemaTypeInterface::class)->getMock();
+
+        $this->index = (new ObjectManager($this))->getObject(
+            Index::class,
+            [
+                'context' => (new ObjectManager($this))->getObject(
+                    Context::class,
+                    [
+                        'request' => $this->requestMock,
+                    ]
+                ),
+                'data' => [
+                    'schema_types' => [
+                        'test' => $this->schemaTypeMock
+                    ]
+                ]
+            ]
+        );
+    }
+
+    /**
+     * Test that the passed URL parameter is used when it is a valid schema type.
+     *
+     * @covers \Magento\Swagger\Block\Index::getSchemaUrl()
+     */
+    public function testGetSchemaUrlValidType()
+    {
+        $this->requestMock->expects($this->atLeastOnce())
+            ->method('getParam')
+            ->willReturn('test');
+
+        $this->schemaTypeMock->expects($this->any())
+            ->method('getCode')->willReturn('test');
+
+        $this->schemaTypeMock->expects($this->once())
+            ->method('getSchemaUrlPath')
+            ->willReturn('/test');
+
+        $this->assertEquals('/test', $this->index->getSchemaUrl());
+    }
+
+    /**
+     * Test that Swagger UI throws an exception if an invalid schema type is supplied.
+     *
+     * @covers \Magento\Swagger\Block\Index::getSchemaUrl()
+     */
+    public function testGetSchemaUrlInvalidType()
+    {
+        $this->requestMock->expects($this->atLeastOnce())
+            ->method('getParam')
+            ->willReturn('invalid');
+
+        $this->schemaTypeMock->expects($this->any())
+            ->method('getCode')->willReturn('test');
+
+        $this->expectException(\UnexpectedValueException::class);
+
+        $this->index->getSchemaUrl();
+    }
+}
diff --git a/app/code/Magento/Swagger/Test/Unit/Controller/Index/IndexTest.php b/app/code/Magento/Swagger/Test/Unit/Controller/Index/IndexTest.php
index 6931979b52f..c409cd6ca75 100644
--- a/app/code/Magento/Swagger/Test/Unit/Controller/Index/IndexTest.php
+++ b/app/code/Magento/Swagger/Test/Unit/Controller/Index/IndexTest.php
@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Swagger\Test\Unit\Controller\Index;
 
 class IndexTest extends \PHPUnit\Framework\TestCase
diff --git a/app/code/Magento/Swagger/etc/module.xml b/app/code/Magento/Swagger/etc/module.xml
index fce24b61b4f..ecc3fd507e9 100644
--- a/app/code/Magento/Swagger/etc/module.xml
+++ b/app/code/Magento/Swagger/etc/module.xml
@@ -6,5 +6,9 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Swagger"  />
+    <module name="Magento_Swagger">
+        <sequence>
+            <module name="Magento_Webapi" />
+        </sequence>
+    </module>
 </config>
diff --git a/app/code/Magento/Swagger/view/frontend/layout/swagger_index_index.xml b/app/code/Magento/Swagger/view/frontend/layout/swagger_index_index.xml
index 458102c38bf..345f063a7aa 100644
--- a/app/code/Magento/Swagger/view/frontend/layout/swagger_index_index.xml
+++ b/app/code/Magento/Swagger/view/frontend/layout/swagger_index_index.xml
@@ -45,8 +45,7 @@
         <referenceContainer name="page.wrapper" remove="true"/>
         <referenceBlock name="requirejs-config" remove="true"/>
         <referenceContainer name="root">
-            <block name="swaggerUiContent" class="Magento\Swagger\Block\Index" template="Magento_Swagger::swagger-ui/index.phtml"/>
+            <block name="swaggerUiContent" class="Magento\Swagger\Block\Index" template="Magento_Swagger::swagger-ui/index.phtml" />
         </referenceContainer>
     </body>
 </page>
-
diff --git a/app/code/Magento/SwaggerWebapi/LICENSE.txt b/app/code/Magento/SwaggerWebapi/LICENSE.txt
new file mode 100644
index 00000000000..49525fd99da
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapi/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/app/code/Magento/SwaggerWebapi/LICENSE_AFL.txt b/app/code/Magento/SwaggerWebapi/LICENSE_AFL.txt
new file mode 100644
index 00000000000..f39d641b18a
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapi/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/app/code/Magento/SwaggerWebapi/Model/SchemaType/Rest.php b/app/code/Magento/SwaggerWebapi/Model/SchemaType/Rest.php
new file mode 100644
index 00000000000..d5a8206a324
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapi/Model/SchemaType/Rest.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\SwaggerWebapi\Model\SchemaType;
+
+use Magento\Swagger\Api\Data\SchemaTypeInterface;
+
+/**
+ * Rest swagger schema type.
+ */
+class Rest implements SchemaTypeInterface
+{
+    /**
+     * @var string
+     */
+    private $code;
+
+    /**
+     * Rest constructor.
+     *
+     * @param string $code
+     */
+    public function __construct(string $code = 'rest')
+    {
+        $this->code = $code;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCode()
+    {
+        return $this->code;
+    }
+
+    /**
+     * @param string|null $store
+     * @return string
+     */
+    public function getSchemaUrlPath($store = null)
+    {
+        $store = $store ?? 'all';
+
+        return '/' . $this->code . '/' . $store . '/schema?services=all';
+    }
+}
diff --git a/app/code/Magento/SwaggerWebapi/README.md b/app/code/Magento/SwaggerWebapi/README.md
new file mode 100644
index 00000000000..3529848949d
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapi/README.md
@@ -0,0 +1 @@
+The Magento_SwaggerWebapi module provides the implementation of the REST Webapi module with Magento_Swagger.
\ No newline at end of file
diff --git a/app/code/Magento/SwaggerWebapi/Test/Unit/Model/SchemaType/RestTest.php b/app/code/Magento/SwaggerWebapi/Test/Unit/Model/SchemaType/RestTest.php
new file mode 100644
index 00000000000..776dd29b683
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapi/Test/Unit/Model/SchemaType/RestTest.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\SwaggerWebapi\Test\Unit\Model\SchemaType;
+
+use Magento\Swagger\Api\Data\SchemaTypeInterface;
+use Magento\SwaggerWebapi\Model\SchemaType\Rest;
+
+class RestTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var SchemaTypeInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $rest;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->rest = new Rest('rest');
+    }
+
+    /**
+     * @covers \Magento\SwaggerWebapi\Model\SchemaType\Rest::getSchemaUrlPath
+     *
+     * @param $expected
+     * @param null|string $store
+     *
+     * @dataProvider getSchemaUrlPathProvider
+     */
+    public function testGetSchemaUrlPath($expected, $store = null)
+    {
+        $this->assertEquals($expected, $this->rest->getSchemaUrlPath($store));
+    }
+
+    /**
+     * @covers \Magento\SwaggerWebapi\Model\SchemaType\Rest::getCode()
+     */
+    public function testGetCode()
+    {
+        $this->assertEquals('rest', $this->rest->getCode());
+    }
+
+    /**
+     * @return array
+     */
+    public function getSchemaUrlPathProvider()
+    {
+        return [
+            [
+                '/rest/all/schema?services=all',
+                null
+            ],
+            [
+                '/rest/test/schema?services=all',
+                'test'
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/SwaggerWebapi/composer.json b/app/code/Magento/SwaggerWebapi/composer.json
new file mode 100644
index 00000000000..d6e58028585
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapi/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "magento/module-swagger-webapi",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "100.3.*",
+        "magento/module-swagger": "100.3.*"
+    },
+    "type": "magento2-module",
+    "version": "100.3.0-dev",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\SwaggerWebapi\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/SwaggerWebapi/etc/frontend/di.xml b/app/code/Magento/SwaggerWebapi/etc/frontend/di.xml
new file mode 100644
index 00000000000..5b54eee0faa
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapi/etc/frontend/di.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\SwaggerWebapi\Model\SchemaType\Rest">
+        <arguments>
+            <argument name="code" xsi:type="string">rest</argument>
+        </arguments>
+    </type>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/SwaggerWebapi/etc/module.xml b/app/code/Magento/SwaggerWebapi/etc/module.xml
new file mode 100644
index 00000000000..b3a80d22de6
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapi/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_SwaggerWebapi">
+        <sequence>
+            <module name="Magento_Webapi" />
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/SwaggerWebapi/registration.php b/app/code/Magento/SwaggerWebapi/registration.php
new file mode 100644
index 00000000000..595497df7cf
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapi/registration.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_SwaggerWebapi', __DIR__);
diff --git a/app/code/Magento/SwaggerWebapi/view/frontend/layout/swagger_index_index.xml b/app/code/Magento/SwaggerWebapi/view/frontend/layout/swagger_index_index.xml
new file mode 100644
index 00000000000..4e6adf5f06f
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapi/view/frontend/layout/swagger_index_index.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="swaggerUiContent">
+            <arguments>
+                <argument name="schema_types" xsi:type="array">
+                    <item name="rest" xsi:type="object">Magento\SwaggerWebapi\Model\SchemaType\Rest</item>
+                </argument>
+                <argument name="default_schema_type_code" xsi:type="string">rest</argument>
+            </arguments>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/app/code/Magento/SwaggerWebapiAsync/LICENSE.txt b/app/code/Magento/SwaggerWebapiAsync/LICENSE.txt
new file mode 100644
index 00000000000..49525fd99da
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapiAsync/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/app/code/Magento/SwaggerWebapiAsync/LICENSE_AFL.txt b/app/code/Magento/SwaggerWebapiAsync/LICENSE_AFL.txt
new file mode 100644
index 00000000000..f39d641b18a
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapiAsync/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/app/code/Magento/SwaggerWebapiAsync/Model/SchemaType/Async.php b/app/code/Magento/SwaggerWebapiAsync/Model/SchemaType/Async.php
new file mode 100644
index 00000000000..52b0810dc57
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapiAsync/Model/SchemaType/Async.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\SwaggerWebapiAsync\Model\SchemaType;
+
+use Magento\Swagger\Api\Data\SchemaTypeInterface;
+
+/**
+ * Async swagger schema type.
+ */
+class Async implements SchemaTypeInterface
+{
+    /**
+     * @var string
+     */
+    private $code;
+
+    /**
+     * Async constructor.
+     *
+     * @param string $code
+     */
+    public function __construct(string $code = 'async')
+    {
+        $this->code = $code;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCode()
+    {
+        return $this->code;
+    }
+
+    /**
+     * @param string|null $store
+     * @return string
+     */
+    public function getSchemaUrlPath($store = null)
+    {
+        $store = $store ?? 'all';
+
+        return '/rest/' . $store . '/' . $this->code . '/schema?services=all';
+    }
+}
diff --git a/app/code/Magento/SwaggerWebapiAsync/README.md b/app/code/Magento/SwaggerWebapiAsync/README.md
new file mode 100644
index 00000000000..373733639c6
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapiAsync/README.md
@@ -0,0 +1 @@
+The Magento_SwaggerWebapiAsync module provides the implementation of the Asynchronous WebApi module with Magento_Swagger.
\ No newline at end of file
diff --git a/app/code/Magento/SwaggerWebapiAsync/Test/Unit/Model/SchemaType/AsyncTest.php b/app/code/Magento/SwaggerWebapiAsync/Test/Unit/Model/SchemaType/AsyncTest.php
new file mode 100644
index 00000000000..6718780fd79
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapiAsync/Test/Unit/Model/SchemaType/AsyncTest.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\SwaggerWebapiAsync\Test\Unit\Model\SchemaType;
+
+use Magento\Swagger\Api\Data\SchemaTypeInterface;
+use Magento\SwaggerWebapiAsync\Model\SchemaType\Async;
+
+class AsyncTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var SchemaTypeInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $async;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->async = new Async('async');
+    }
+
+    /**
+     * @covers \Magento\SwaggerWebapiAsync\Model\SchemaType\Async::getCode()
+     */
+    public function testGetCode()
+    {
+        $this->assertEquals('async', $this->async->getCode());
+    }
+
+    /**
+     * @covers \Magento\SwaggerWebapiAsync\Model\SchemaType\Async::getSchemaUrlPathProvider
+     *
+     * @param null|string $store
+     * @param $expected
+     *
+     * @dataProvider getSchemaUrlPathProvider
+     */
+    public function testGetSchemaUrlPath($expected, $store = null)
+    {
+        $this->assertEquals($expected, $this->async->getSchemaUrlPath($store));
+    }
+
+    /**
+     * @return array
+     */
+    public function getSchemaUrlPathProvider()
+    {
+        return [
+            [
+                '/rest/all/async/schema?services=all',
+                null
+            ],
+            [
+                '/rest/test/async/schema?services=all',
+                'test'
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/SwaggerWebapiAsync/composer.json b/app/code/Magento/SwaggerWebapiAsync/composer.json
new file mode 100644
index 00000000000..d443e4f0b46
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapiAsync/composer.json
@@ -0,0 +1,28 @@
+{
+    "name": "magento/module-swagger-webapi-async",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "100.3.*",
+        "magento/module-swagger": "100.3.*"
+    },
+    "suggest": {
+        "magento/module-config": "100.3.*"
+    },
+    "type": "magento2-module",
+    "version": "100.3.0-dev",
+    "license": [
+        "proprietary"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\SwaggerWebapiAsync\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/SwaggerWebapiAsync/etc/frontend/di.xml b/app/code/Magento/SwaggerWebapiAsync/etc/frontend/di.xml
new file mode 100644
index 00000000000..8d56182324c
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapiAsync/etc/frontend/di.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\SwaggerWebapiAsync\Model\SchemaType\Async">
+        <arguments>
+            <argument name="code" xsi:type="string">async</argument>
+        </arguments>
+    </type>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/SwaggerWebapiAsync/etc/module.xml b/app/code/Magento/SwaggerWebapiAsync/etc/module.xml
new file mode 100644
index 00000000000..5f5333654f2
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapiAsync/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_SwaggerWebapiAsync">
+        <sequence>
+            <module name="Magento_Webapi" />
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/SwaggerWebapiAsync/registration.php b/app/code/Magento/SwaggerWebapiAsync/registration.php
new file mode 100644
index 00000000000..8805b81ca28
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapiAsync/registration.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use \Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_SwaggerWebapiAsync', __DIR__);
diff --git a/app/code/Magento/SwaggerWebapiAsync/view/frontend/layout/swagger_index_index.xml b/app/code/Magento/SwaggerWebapiAsync/view/frontend/layout/swagger_index_index.xml
new file mode 100644
index 00000000000..c64e6f15a09
--- /dev/null
+++ b/app/code/Magento/SwaggerWebapiAsync/view/frontend/layout/swagger_index_index.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="swaggerUiContent">
+            <arguments>
+                <argument name="schema_types" xsi:type="array">
+                    <item name="async" xsi:type="object">Magento\SwaggerWebapiAsync\Model\SchemaType\Async</item>
+                </argument>
+            </arguments>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php b/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
index 6a42ad1cc98..85633475205 100644
--- a/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
+++ b/app/code/Magento/Swatches/Block/Product/Renderer/Listing/Configurable.php
@@ -5,16 +5,94 @@
  */
 namespace Magento\Swatches\Block\Product\Renderer\Listing;
 
+use Magento\Catalog\Block\Product\Context;
+use Magento\Catalog\Helper\Product as CatalogProduct;
 use Magento\Catalog\Model\Product;
+use Magento\ConfigurableProduct\Helper\Data;
+use Magento\ConfigurableProduct\Model\ConfigurableAttributeData;
+use Magento\Customer\Helper\Session\CurrentCustomer;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Json\EncoderInterface;
+use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Framework\Stdlib\ArrayUtils;
+use Magento\Swatches\Helper\Data as SwatchData;
+use Magento\Swatches\Helper\Media;
+use Magento\Swatches\Model\SwatchAttributesProvider;
 
 /**
  * Swatch renderer block in Category page
  *
  * @api
  * @since 100.0.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Configurable extends \Magento\Swatches\Block\Product\Renderer\Configurable
 {
+    /**
+     * @var \Magento\Framework\Locale\Format
+     */
+    private $localeFormat;
+
+    /**
+     * @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices
+     */
+    private $variationPrices;
+
+    /**
+     * @param Context $context
+     * @param ArrayUtils $arrayUtils
+     * @param EncoderInterface $jsonEncoder
+     * @param Data $helper
+     * @param CatalogProduct $catalogProduct
+     * @param CurrentCustomer $currentCustomer
+     * @param PriceCurrencyInterface $priceCurrency
+     * @param ConfigurableAttributeData $configurableAttributeData
+     * @param SwatchData $swatchHelper
+     * @param Media $swatchMediaHelper
+     * @param array $data other data
+     * @param SwatchAttributesProvider $swatchAttributesProvider
+     * @param \Magento\Framework\Locale\Format|null $localeFormat
+     * @param \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices|null $variationPrices
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     */
+    public function __construct(
+        Context $context,
+        ArrayUtils $arrayUtils,
+        EncoderInterface $jsonEncoder,
+        Data $helper,
+        CatalogProduct $catalogProduct,
+        CurrentCustomer $currentCustomer,
+        PriceCurrencyInterface $priceCurrency,
+        ConfigurableAttributeData $configurableAttributeData,
+        SwatchData $swatchHelper,
+        Media $swatchMediaHelper,
+        array $data = [],
+        SwatchAttributesProvider $swatchAttributesProvider = null,
+        \Magento\Framework\Locale\Format $localeFormat = null,
+        \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices $variationPrices = null
+    ) {
+        parent::__construct(
+            $context,
+            $arrayUtils,
+            $jsonEncoder,
+            $helper,
+            $catalogProduct,
+            $currentCustomer,
+            $priceCurrency,
+            $configurableAttributeData,
+            $swatchHelper,
+            $swatchMediaHelper,
+            $data,
+            $swatchAttributesProvider
+        );
+        $this->localeFormat = $localeFormat ?: ObjectManager::getInstance()->get(
+            \Magento\Framework\Locale\Format::class
+        );
+        $this->variationPrices = $variationPrices ?: ObjectManager::getInstance()->get(
+            \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices::class
+        );
+    }
+
     /**
      * @return string
      */
@@ -66,6 +144,28 @@ public function getJsonConfig()
         $this->unsetData('allow_products');
         return parent::getJsonConfig();
     }
+    
+    /**
+     * Composes configuration for js price format
+     *
+     * @return string
+     */
+    public function getPriceFormatJson()
+    {
+        return $this->jsonEncoder->encode($this->localeFormat->getPriceFormat());
+    }
+
+    /**
+     * Composes configuration for js price
+     *
+     * @return string
+     */
+    public function getPricesJson()
+    {
+        return $this->jsonEncoder->encode(
+            $this->variationPrices->getFormattedPrices($this->getProduct()->getPriceInfo())
+        );
+    }
 
     /**
      * Do not load images for Configurable product with swatches due to its loaded by request
diff --git a/app/code/Magento/Swatches/Test/Unit/Block/Product/Renderer/Listing/ConfigurableTest.php b/app/code/Magento/Swatches/Test/Unit/Block/Product/Renderer/Listing/ConfigurableTest.php
index 77369ad12fd..6b72422d050 100644
--- a/app/code/Magento/Swatches/Test/Unit/Block/Product/Renderer/Listing/ConfigurableTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Block/Product/Renderer/Listing/ConfigurableTest.php
@@ -9,6 +9,7 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class ConfigurableTest extends \PHPUnit\Framework\TestCase
 {
@@ -57,6 +58,9 @@ class ConfigurableTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject  */
     private $urlBuilder;
 
+    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    private $variationPricesMock;
+
     public function setUp()
     {
         $this->arrayUtils = $this->createMock(\Magento\Framework\Stdlib\ArrayUtils::class);
@@ -75,6 +79,9 @@ public function setUp()
         $this->scopeConfig = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
         $this->imageHelper = $this->createMock(\Magento\Catalog\Helper\Image::class);
         $this->urlBuilder = $this->createMock(\Magento\Framework\UrlInterface::class);
+        $this->variationPricesMock = $this->createMock(
+            \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Variations\Prices::class
+        );
 
         $objectManagerHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
         $this->configurable = $objectManagerHelper->getObject(
@@ -93,6 +100,7 @@ public function setUp()
                 'priceCurrency' => $this->priceCurrency,
                 'configurableAttributeData' => $this->configurableAttributeData,
                 'data' => [],
+                'variationPrices' => $this->variationPricesMock
             ]
         );
     }
@@ -201,4 +209,30 @@ private function prepareGetJsonSwatchConfig()
         $this->helper->expects($this->any())->method('getAllowAttributes')->with($this->product)
             ->willReturn([$attribute1]);
     }
+
+    public function testGetPricesJson()
+    {
+        $expectedPrices = [
+            'oldPrice' => [
+                'amount' => 10,
+            ],
+            'basePrice' => [
+                'amount' => 15,
+            ],
+            'finalPrice' => [
+                'amount' => 20,
+            ],
+        ];
+
+        $priceInfoMock = $this->createMock(\Magento\Framework\Pricing\PriceInfo\Base::class);
+        $this->configurable->setProduct($this->product);
+        $this->product->expects($this->once())->method('getPriceInfo')->willReturn($priceInfoMock);
+        $this->variationPricesMock->expects($this->once())
+            ->method('getFormattedPrices')
+            ->with($priceInfoMock)
+            ->willReturn($expectedPrices);
+
+        $this->jsonEncoder->expects($this->once())->method('encode')->with($expectedPrices);
+        $this->configurable->getPricesJson();
+    }
 }
diff --git a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
index 7ecd6558ef6..e65345b38d9 100644
--- a/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
+++ b/app/code/Magento/Swatches/view/frontend/templates/product/listing/renderer.phtml
@@ -4,37 +4,38 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php /** @var $block \Magento\Swatches\Block\Product\Renderer\Configurable */ ?>
-<div class="swatch-opt-<?= /* @escapeNotVerified */ $block->getProduct()->getId() ?>"></div>
-<script>
-    require([
-        'jquery',
-        'jquery/ui',
-        'Magento_Swatches/js/swatch-renderer',
-        'Magento_Swatches/js/catalog-add-to-cart',
-        'priceBox'
-    ], function ($) {
-        var jsonConfig = <?= /* @escapeNotVerified */ $block->getJsonConfig() ?>;
-
-        $('.swatch-opt-<?= /* @escapeNotVerified */ $block->getProduct()->getId() ?>').SwatchRenderer({
-            selectorProduct: '.product-item-details',
-            onlySwatches: true,
-            enableControlLabel: false,
-            numberToShow: <?= /* @escapeNotVerified */ $block->getNumberSwatchesPerProduct() ?>,
-            jsonConfig: jsonConfig,
-            jsonSwatchConfig: <?= /* @escapeNotVerified */ $block->getJsonSwatchConfig() ?>,
-            mediaCallback: '<?= /* @escapeNotVerified */ $block->getMediaCallback() ?>'
-        });
-
-        var dataPriceBoxSelector = '[data-role=priceBox]',
-            dataProductIdSelector = '[data-product-id=<?= $block->escapeHtml($block->getProduct()->getId()) ?>]',
-            priceBoxes = $(dataPriceBoxSelector + dataProductIdSelector);
+<?php
+/** @var $block \Magento\Swatches\Block\Product\Renderer\Listing\Configurable */
+$productId = $block->getProduct()->getId();
+?>
+<div class="swatch-opt-<?= /* @escapeNotVerified */ $productId ?>"
+     data-role="swatch-option-<?= /* @escapeNotVerified */ $productId ?>"></div>
 
-        priceBoxes.priceBox({
-            'priceConfig': {
-                priceFormat: jsonConfig.priceFormat,
-                prices: jsonConfig.prices
+<script type="text/x-magento-init">
+    {
+        "[data-role=swatch-option-<?= /* @escapeNotVerified */ $productId ?>]": {
+            "Magento_Swatches/js/swatch-renderer": {
+                "selectorProduct": ".product-item-details",
+                "onlySwatches": true,
+                "enableControlLabel": false,
+                "numberToShow": <?= /* @escapeNotVerified */ $block->getNumberSwatchesPerProduct(); ?>,
+                "jsonConfig": <?= /* @escapeNotVerified */ $block->getJsonConfig(); ?>,
+                "jsonSwatchConfig": <?= /* @escapeNotVerified */ $block->getJsonSwatchConfig(); ?>,
+                "mediaCallback": "<?= /* @escapeNotVerified */ $block->getMediaCallback() ?>"
             }
-        });
-    });
+        }
+    }
 </script>
+
+<script type="text/x-magento-init">
+    {
+        "[data-role=priceBox][data-price-box=product-id-<?= /* @escapeNotVerified */ $productId ?>]": {
+            "priceBox": {
+                "priceConfig": {
+                    "priceFormat": <?= /* @escapeNotVerified */ $block->getPriceFormatJson(); ?>,
+                    "prices": <?= /* @escapeNotVerified */ $block->getPricesJson(); ?>
+                }
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/app/code/Magento/Tax/Test/Unit/Observer/UpdateProductOptionsObserverTest.php b/app/code/Magento/Tax/Test/Unit/Observer/UpdateProductOptionsObserverTest.php
index aaaf72b9862..97fb5472a28 100644
--- a/app/code/Magento/Tax/Test/Unit/Observer/UpdateProductOptionsObserverTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Observer/UpdateProductOptionsObserverTest.php
@@ -64,18 +64,18 @@ public function testUpdateProductOptions(
             ->method('getEvent')
             ->will($this->returnValue($eventObject));
 
-         $objectManager = new ObjectManager($this);
-         $taxObserverObject = $objectManager->getObject(
-             \Magento\Tax\Observer\UpdateProductOptionsObserver::class,
-             [
-                 'taxData' => $taxData,
-                 'registry' => $registry,
-             ]
-         );
-
-         $taxObserverObject->execute($observerObject);
-
-         $this->assertEquals($expected, $frameworkObject->getAdditionalOptions());
+        $objectManager = new ObjectManager($this);
+        $taxObserverObject = $objectManager->getObject(
+            \Magento\Tax\Observer\UpdateProductOptionsObserver::class,
+            [
+                'taxData' => $taxData,
+                'registry' => $registry,
+            ]
+        );
+
+        $taxObserverObject->execute($observerObject);
+
+        $this->assertEquals($expected, $frameworkObject->getAdditionalOptions());
     }
 
     /**
diff --git a/app/code/Magento/Theme/Block/Html/Topmenu.php b/app/code/Magento/Theme/Block/Html/Topmenu.php
index ed3445e1173..0aaaf34a059 100644
--- a/app/code/Magento/Theme/Block/Html/Topmenu.php
+++ b/app/code/Magento/Theme/Block/Html/Topmenu.php
@@ -177,7 +177,7 @@ protected function _addSubMenu($child, $childLevel, $childrenWrapClass, $limit)
             return $html;
         }
 
-        $colStops = null;
+        $colStops = [];
         if ($childLevel == 0 && $limit) {
             $colStops = $this->_columnBrake($child->getChildren(), $limit);
         }
@@ -205,7 +205,7 @@ protected function _getHtml(
         \Magento\Framework\Data\Tree\Node $menuTree,
         $childrenWrapClass,
         $limit,
-        $colBrakes = []
+        array $colBrakes = []
     ) {
         $html = '';
 
@@ -244,7 +244,7 @@ protected function _getHtml(
                 }
             }
 
-            if (count($colBrakes) && $colBrakes[$counter]['colbrake']) {
+            if (is_array($colBrakes) && count($colBrakes) && $colBrakes[$counter]['colbrake']) {
                 $html .= '</ul></li><li class="column"><ul>';
             }
 
@@ -261,7 +261,7 @@ protected function _getHtml(
             $counter++;
         }
 
-        if (count($colBrakes) && $limit) {
+        if (is_array($colBrakes) && count($colBrakes) && $limit) {
             $html = '<li class="column"><ul>' . $html . '</ul></li>';
         }
 
diff --git a/app/code/Magento/Theme/Model/Config/Processor/DesignTheme.php b/app/code/Magento/Theme/Model/Config/Processor/DesignTheme.php
index 258be67979e..d9d2c0e041e 100644
--- a/app/code/Magento/Theme/Model/Config/Processor/DesignTheme.php
+++ b/app/code/Magento/Theme/Model/Config/Processor/DesignTheme.php
@@ -72,8 +72,8 @@ public function process(array $config)
     private function changeThemeFullPathToIdentifier($configItems)
     {
         $theme = null;
-        if ($this->arrayManager->exists(DesignInterface::XML_PATH_THEME_ID, $configItems)) {
-            $themeIdentifier = $this->arrayManager->get(DesignInterface::XML_PATH_THEME_ID, $configItems);
+        $themeIdentifier = $this->arrayManager->get(DesignInterface::XML_PATH_THEME_ID, $configItems);
+        if (!empty($themeIdentifier)) {
             if (!is_numeric($themeIdentifier)) {
                 // workaround for case when db is not available
                 try {
diff --git a/app/code/Magento/Theme/Model/Design/Backend/File.php b/app/code/Magento/Theme/Model/Design/Backend/File.php
index 1e32cb36b4a..b37628e54aa 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/File.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/File.php
@@ -89,9 +89,9 @@ public function beforeSave()
         $values = $this->getValue();
         $value = reset($values) ?: [];
         if (!isset($value['file'])) {
-             throw new LocalizedException(
-                 __('%1 does not contain field \'file\'', $this->getData('field_config/field'))
-             );
+            throw new LocalizedException(
+                __('%1 does not contain field \'file\'', $this->getData('field_config/field'))
+            );
         }
         if (isset($value['exists'])) {
             $this->setValue($value['file']);
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Config/Processor/DesignThemeTest.php b/app/code/Magento/Theme/Test/Unit/Model/Config/Processor/DesignThemeTest.php
index 1f3ab5642f4..db9283c54f2 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Config/Processor/DesignThemeTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Config/Processor/DesignThemeTest.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Theme\Test\Unit\Model\Config\Processor;
 
-use Magento\Config\App\Config\Source\DumpConfigSourceAggregated;
 use Magento\Framework\Stdlib\ArrayManager;
 use Magento\Framework\View\Design\Theme\ListInterface;
 use Magento\Theme\Model\Config\Processor\DesignTheme;
@@ -78,6 +77,7 @@ private function prepareThemeMock()
 
     /**
      * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function getDumpConfigDataProvider()
     {
@@ -162,6 +162,22 @@ public function getDumpConfigDataProvider()
                         ],
                     ],
                 ],
+                [
+                    [
+                        'websites' => [
+                            'base' => [
+                                'design' => ['theme' => ['theme_id' => '']],
+                            ],
+                        ],
+                    ],
+                    [
+                        'websites' => [
+                            'base' => [
+                                'design' => ['theme' => ['theme_id' => '']],
+                            ],
+                        ],
+                    ],
+                ],
             ],
         ];
     }
diff --git a/app/code/Magento/Theme/view/base/requirejs-config.js b/app/code/Magento/Theme/view/base/requirejs-config.js
index bd72a3d74fa..c5ebd40e896 100644
--- a/app/code/Magento/Theme/view/base/requirejs-config.js
+++ b/app/code/Magento/Theme/view/base/requirejs-config.js
@@ -15,7 +15,6 @@ var config = {
     },
     'shim': {
         'jquery/jquery-migrate': ['jquery'],
-        'jquery/jquery.hashchange': ['jquery', 'jquery/jquery-migrate'],
         'jquery/jstree/jquery.hotkeys': ['jquery'],
         'jquery/hover-intent': ['jquery'],
         'mage/adminhtml/backup': ['prototype'],
@@ -39,7 +38,6 @@ var config = {
         'jquery/validate': 'jquery/jquery.validate',
         'jquery/hover-intent': 'jquery/jquery.hoverIntent',
         'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-fp',
-        'jquery/jquery.hashchange': 'jquery/jquery.ba-hashchange.min',
         'prototype': 'legacy-build.min',
         'jquery/jquery-storageapi': 'jquery/jquery.storageapi.min',
         'text': 'mage/requirejs/text',
diff --git a/app/code/Magento/Translation/Model/FileManager.php b/app/code/Magento/Translation/Model/FileManager.php
index b4a541f2579..387173f6de0 100644
--- a/app/code/Magento/Translation/Model/FileManager.php
+++ b/app/code/Magento/Translation/Model/FileManager.php
@@ -129,11 +129,12 @@ public function updateTranslationFileContent($content)
     public function getTranslationFileVersion()
     {
         $translationFile = $this->getTranslationFileFullPath();
-        if (!$this->driverFile->isExists($translationFile)) {
-            $this->updateTranslationFileContent($this->translationFile->getTranslationFileContent());
+        $translationFileHash = '';
+
+        if ($this->driverFile->isExists($translationFile)) {
+            $translationFileHash = sha1_file($translationFile);
         }
 
-        $translationFileHash = sha1_file($translationFile);
         return sha1($translationFileHash . $this->getTranslationFilePath());
     }
 }
diff --git a/app/code/Magento/Translation/Model/Json/PreProcessor.php b/app/code/Magento/Translation/Model/Json/PreProcessor.php
index e503140adac..5d46c3c8b06 100644
--- a/app/code/Magento/Translation/Model/Json/PreProcessor.php
+++ b/app/code/Magento/Translation/Model/Json/PreProcessor.php
@@ -3,15 +3,18 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Translation\Model\Json;
 
+use Magento\Framework\App\AreaList;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\TranslateInterface;
+use Magento\Framework\View\Asset\File\FallbackContext;
+use Magento\Framework\View\Asset\PreProcessor\Chain;
 use Magento\Framework\View\Asset\PreProcessorInterface;
+use Magento\Framework\View\DesignInterface;
 use Magento\Translation\Model\Js\Config;
 use Magento\Translation\Model\Js\DataProviderInterface;
-use Magento\Framework\View\Asset\PreProcessor\Chain;
-use Magento\Framework\View\Asset\File\FallbackContext;
-use Magento\Framework\App\AreaList;
-use Magento\Framework\TranslateInterface;
 
 /**
  * PreProcessor responsible for providing js translation dictionary
@@ -42,22 +45,30 @@ class PreProcessor implements PreProcessorInterface
      */
     protected $translate;
 
+    /**
+     * @var DesignInterface
+     */
+    private $viewDesign;
+
     /**
      * @param Config $config
      * @param DataProviderInterface $dataProvider
      * @param AreaList $areaList
      * @param TranslateInterface $translate
+     * @param DesignInterface|null $viewDesign
      */
     public function __construct(
         Config $config,
         DataProviderInterface $dataProvider,
         AreaList $areaList,
-        TranslateInterface $translate
+        TranslateInterface $translate,
+        DesignInterface $viewDesign = null
     ) {
         $this->config = $config;
         $this->dataProvider = $dataProvider;
         $this->areaList = $areaList;
         $this->translate = $translate;
+        $this->viewDesign = $viewDesign ?? ObjectManager::getInstance()->get(DesignInterface::class);
     }
 
     /**
@@ -77,6 +88,8 @@ public function process(Chain $chain)
             if ($context instanceof FallbackContext) {
                 $themePath = $context->getThemePath();
                 $areaCode = $context->getAreaCode();
+
+                $this->viewDesign->setDesignTheme($themePath, $areaCode);
             }
 
             $area = $this->areaList->getArea($areaCode);
diff --git a/app/code/Magento/Translation/Test/Unit/Model/Json/PreProcessorTest.php b/app/code/Magento/Translation/Test/Unit/Model/Json/PreProcessorTest.php
index 0a575474f5f..d9340e03dc9 100644
--- a/app/code/Magento/Translation/Test/Unit/Model/Json/PreProcessorTest.php
+++ b/app/code/Magento/Translation/Test/Unit/Model/Json/PreProcessorTest.php
@@ -36,17 +36,24 @@ class PreProcessorTest extends \PHPUnit\Framework\TestCase
      */
     protected $translateMock;
 
+    /**
+     * @var \Magento\Framework\View\DesignInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $designMock;
+
     protected function setUp()
     {
         $this->configMock = $this->createMock(\Magento\Translation\Model\Js\Config::class);
         $this->dataProviderMock = $this->createMock(\Magento\Translation\Model\Js\DataProvider::class);
         $this->areaListMock = $this->createMock(\Magento\Framework\App\AreaList::class);
         $this->translateMock = $this->getMockForAbstractClass(\Magento\Framework\TranslateInterface::class);
+        $this->designMock = $this->getMockForAbstractClass(\Magento\Framework\View\DesignInterface::class);
         $this->model = new PreProcessor(
             $this->configMock,
             $this->dataProviderMock,
             $this->areaListMock,
-            $this->translateMock
+            $this->translateMock,
+            $this->designMock
         );
     }
 
@@ -84,6 +91,8 @@ public function testGetData()
             ->method('getLocale')
             ->willReturn('en_US');
 
+        $this->designMock->expects($this->once())->method('setDesignTheme')->with($themePath, $areaCode);
+
         $this->areaListMock->expects($this->once())
             ->method('getArea')
             ->with($areaCode)
diff --git a/app/code/Magento/Translation/view/base/templates/translate.phtml b/app/code/Magento/Translation/view/base/templates/translate.phtml
index 780520c0a96..ec88b1d0920 100644
--- a/app/code/Magento/Translation/view/base/templates/translate.phtml
+++ b/app/code/Magento/Translation/view/base/templates/translate.phtml
@@ -28,7 +28,7 @@
 
                 <?php $version = $block->getTranslationFileVersion(); ?>
 
-                if (versionObj.version !== '<?php $block->escapeJsQuote($version) ?>') {
+                if (versionObj.version !== '<?= /* @escapeNotVerified */ $block->escapeJsQuote($version) ?>') {
                     dependencies.push(
                         'text!<?= /* @noEscape */ Magento\Translation\Model\Js\Config::DICTIONARY_FILE_NAME ?>'
                     );
@@ -44,7 +44,7 @@
                             $.localStorage.set(
                                 'mage-translation-file-version',
                                 {
-                                    version: '<?php $block->escapeJsQuote($version) ?>'
+                                    version: '<?= /* @escapeNotVerified */ $block->escapeJsQuote($version) ?>'
                                 }
                             );
                         } else {
diff --git a/app/code/Magento/Ui/Component/Form/Element/UrlInput.php b/app/code/Magento/Ui/Component/Form/Element/UrlInput.php
new file mode 100644
index 00000000000..1427e7b3fad
--- /dev/null
+++ b/app/code/Magento/Ui/Component/Form/Element/UrlInput.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Ui\Component\Form\Element;
+
+/**
+ * Url Input to process data for urlInput component
+ */
+class UrlInput extends \Magento\Ui\Component\Form\Element\AbstractElement
+{
+    const NAME = 'urlInput';
+
+    /**
+     * Get component name
+     *
+     * @return string
+     */
+    public function getComponentName()
+    {
+        return static::NAME;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function prepare()
+    {
+        $config = $this->getData('config');
+        //process urlTypes
+        if (isset($config['urlTypes'])) {
+            $links = $config['urlTypes']->getConfig();
+            $config['urlTypes'] = $links;
+        }
+        $this->setData('config', (array)$config);
+        parent::prepare();
+    }
+}
diff --git a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
index a985c9aca43..fb99cef8e53 100644
--- a/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
+++ b/app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php
@@ -100,7 +100,7 @@ public function execute()
         } catch (\Exception $e) {
             $this->logger->critical($e);
             $result = [
-                'error' => _('UI component could not be rendered because of system exception'),
+                'error' => __('UI component could not be rendered because of system exception'),
                 'errorcode' => $this->escaper->escapeHtml($e->getCode())
             ];
             /** @var \Magento\Framework\Controller\Result\Json $resultJson */
diff --git a/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php b/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php
index cff6171395e..971da30d100 100644
--- a/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php
+++ b/app/code/Magento/Ui/DataProvider/AbstractDataProvider.php
@@ -12,7 +12,7 @@
  * @api
  * @since 100.0.2
  */
-abstract class AbstractDataProvider implements DataProviderInterface
+abstract class AbstractDataProvider implements DataProviderInterface, \Countable
 {
     /**
      * Data Provider name
diff --git a/app/code/Magento/Ui/Model/UrlInput/ConfigInterface.php b/app/code/Magento/Ui/Model/UrlInput/ConfigInterface.php
new file mode 100644
index 00000000000..b7254b5ff34
--- /dev/null
+++ b/app/code/Magento/Ui/Model/UrlInput/ConfigInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Ui\Model\UrlInput;
+
+/**
+ * Config interface for url link types
+ */
+interface ConfigInterface
+{
+    /**
+     * Returns config for url link type
+     *
+     * @return array
+     */
+    public function getConfig();
+}
diff --git a/app/code/Magento/Ui/Model/UrlInput/LinksConfigProvider.php b/app/code/Magento/Ui/Model/UrlInput/LinksConfigProvider.php
new file mode 100644
index 00000000000..ab2670bc953
--- /dev/null
+++ b/app/code/Magento/Ui/Model/UrlInput/LinksConfigProvider.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Ui\Model\UrlInput;
+
+/**
+ * Returns information about allowed links
+ */
+class LinksConfigProvider implements ConfigInterface
+{
+    /**
+     * @var array
+     */
+    private $linksConfiguration;
+
+    /**
+     * Object manager
+     *
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * LinksProvider constructor.
+     * @param array $linksConfiguration
+     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     */
+    public function __construct(
+        array $linksConfiguration,
+        \Magento\Framework\ObjectManagerInterface $objectManager
+    ) {
+        $this->linksConfiguration = $linksConfiguration;
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConfig()
+    {
+        $config = [];
+        foreach ($this->linksConfiguration as $linkName => $className) {
+            $config[$linkName] = $this->createConfigProvider($className)->getConfig();
+        }
+        return $config;
+    }
+
+    /**
+     * Create config provider
+     *
+     * @param string $instance
+     * @return ConfigInterface
+     */
+    private function createConfigProvider($instance)
+    {
+        if (!is_subclass_of(
+            $instance,
+            ConfigInterface::class
+        )
+        ) {
+            throw new \InvalidArgumentException(
+                $instance .
+                ' does not implement ' .
+                ConfigInterface::class
+            );
+        }
+        return $this->objectManager->create($instance);
+    }
+}
diff --git a/app/code/Magento/Ui/Model/UrlInput/Url.php b/app/code/Magento/Ui/Model/UrlInput/Url.php
new file mode 100644
index 00000000000..35361728c5a
--- /dev/null
+++ b/app/code/Magento/Ui/Model/UrlInput/Url.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Ui\Model\UrlInput;
+
+/**
+ * Returns configuration for default Url Input type
+ */
+class Url implements ConfigInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getConfig()
+    {
+        return [
+            'label' => __('URL'),
+            'component' => 'Magento_Ui/js/form/element/abstract',
+            'template' => 'ui/form/element/input',
+            'sortOrder' => 20,
+        ];
+    }
+}
diff --git a/app/code/Magento/Ui/etc/adminhtml/di.xml b/app/code/Magento/Ui/etc/adminhtml/di.xml
index 416d7a6916f..1198f4b1e9e 100644
--- a/app/code/Magento/Ui/etc/adminhtml/di.xml
+++ b/app/code/Magento/Ui/etc/adminhtml/di.xml
@@ -44,4 +44,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Ui\Model\UrlInput\LinksConfigProvider">
+        <arguments>
+            <argument name="linksConfiguration" xsi:type="array">
+                <item name="default" xsi:type="string">Magento\Ui\Model\UrlInput\Url</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Ui/etc/di.xml b/app/code/Magento/Ui/etc/di.xml
index 09a17f8b2af..8cf0e1e12e7 100644
--- a/app/code/Magento/Ui/etc/di.xml
+++ b/app/code/Magento/Ui/etc/di.xml
@@ -416,6 +416,7 @@
                 <item name="additionalClasses" xsi:type="object">Magento\Ui\Config\Converter\AdditionalClasses</item>
                 <item name="options" xsi:type="object">Magento\Ui\Config\Converter\Options</item>
                 <item name="actions" xsi:type="object">Magento\Ui\Config\Converter\Actions\Proxy</item>
+                <item name="urlTypes" xsi:type="object">Magento\Ui\Config\Converter\Actions\Proxy</item>
             </argument>
             <argument name="discriminator" xsi:type="string">type</argument>
         </arguments>
diff --git a/app/code/Magento/Ui/etc/ui_components.xsd b/app/code/Magento/Ui/etc/ui_components.xsd
index 3d3c0d11bb4..af0d8bb6f18 100644
--- a/app/code/Magento/Ui/etc/ui_components.xsd
+++ b/app/code/Magento/Ui/etc/ui_components.xsd
@@ -28,6 +28,7 @@
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/email.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/exportButton.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/field.xsd"/>
+    <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/urlInput.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/fieldset.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/file.xsd"/>
     <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/fileUploader.xsd"/>
diff --git a/app/code/Magento/Ui/etc/ui_configuration.xsd b/app/code/Magento/Ui/etc/ui_configuration.xsd
index 5783323b531..17b19d2d6d6 100644
--- a/app/code/Magento/Ui/etc/ui_configuration.xsd
+++ b/app/code/Magento/Ui/etc/ui_configuration.xsd
@@ -54,6 +54,7 @@
             <xs:element ref="text" maxOccurs="unbounded"/>
             <xs:element ref="textarea" maxOccurs="unbounded"/>
             <xs:element ref="wysiwyg" maxOccurs="unbounded"/>
+            <xs:element ref="urlInput" maxOccurs="unbounded"/>
         </xs:choice>
     </xs:group>
     <xs:group name="listingElements">
@@ -780,4 +781,12 @@
             </xs:documentation>
         </xs:annotation>
     </xs:element>
+    <xs:element name="urlInput" type="componentUrlInput">
+        <xs:annotation>
+            <xs:documentation>
+                The Url Input component allows to insert External URL and relative URL into the content. Add abilities
+                to define custom url link types.
+            </xs:documentation>
+        </xs:annotation>
+    </xs:element>
 </xs:schema>
diff --git a/app/code/Magento/Ui/etc/ui_definition.xsd b/app/code/Magento/Ui/etc/ui_definition.xsd
index d1787309d05..7473e943115 100644
--- a/app/code/Magento/Ui/etc/ui_definition.xsd
+++ b/app/code/Magento/Ui/etc/ui_definition.xsd
@@ -75,6 +75,7 @@
             <xs:element name="textarea" type="componentTextarea"/>
             <xs:element name="wysiwyg" type="componentWysiwyg"/>
             <xs:element name="inlineEditing" type="componentInlineEditing"/>
+            <xs:element name="urlInput" type="componentUrlInput"/>
         </xs:choice>
     </xs:complexType>
 </xs:schema>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml b/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml
index cc3162e2b9a..277eef2f2d2 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition.map.xml
@@ -410,6 +410,22 @@
     <component name="hidden" include="abstractSettings"/>
     <component name="filterInput" include="abstractSettings"/>
     <component name="filterDate" include="abstractSettings"/>
+    <!--add here list of required settings-->
+    <component name="urlInput" include="abstractSettings">
+        <schema name="current">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <!--selected related data-->
+                    <item name="urlTypes" type="urlTypes" xsi:type="converter">settings/urlTypes</item>
+                    <item name="isDisplayAdditionalSettings" type="boolean" xsi:type="xpath">settings/isDisplayAdditionalSettings</item>
+                    <item name="settingLabel" type="string" translate="true" xsi:type="xpath">settings/settingLabel</item>
+                    <item name="typeSelectorTemplate" type="string" translate="true" xsi:type="xpath">settings/typeSelectorTemplate</item>
+                    <item name="settingTemplate" type="string" translate="true" xsi:type="xpath">settings/settingTemplate</item>
+                    <item name="settingValue" type="boolean" xsi:type="xpath">settings/settingValue</item>
+                </item>
+            </argument>
+        </schema>
+    </component>
     <component name="fileUploader" include="abstractSettings">
         <schema name="current">
             <argument name="data" xsi:type="array">
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml b/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml
index 4b4eac517a2..73bf7ffbfa4 100755
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition.xml
@@ -149,6 +149,13 @@
             <initialMediaGalleryOpenSubpath>wysiwyg</initialMediaGalleryOpenSubpath>
         </settings>
     </imageUploader>
+    <urlInput class="Magento\Ui\Component\Form\Element\UrlInput" component="Magento_Ui/js/form/element/url-input" template="ui/form/element/url-input">
+        <settings>
+            <settingTemplate>ui/form/element/urlInput/setting</settingTemplate>
+            <typeSelectorTemplate>ui/form/element/urlInput/typeSelector</typeSelectorTemplate>
+            <isDisplayAdditionalSettings>true</isDisplayAdditionalSettings>
+        </settings>
+    </urlInput>
     <!-- Form elements -->
 
     <!-- Form element data types -->
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/ui_settings.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/ui_settings.xsd
index 9f9d1f519f4..cbf69e60469 100644
--- a/app/code/Magento/Ui/view/base/ui_component/etc/definition/ui_settings.xsd
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/ui_settings.xsd
@@ -219,6 +219,15 @@
         </xs:attribute>
     </xs:complexType>
 
+    <xs:complexType name="urlsType">
+        <xs:annotation>
+            <xs:documentation>
+                The array of the configuration for urls types to be displayed in the list for selection.
+            </xs:documentation>
+        </xs:annotation>
+
+    </xs:complexType>
+
     <xs:element name="param" type="argumentType"/>
 
     <xs:element name="multiple" type="xs:boolean">
@@ -601,18 +610,33 @@
         </xs:choice>
     </xs:complexType>
 
-    <xs:complexType name="exportsType">
+    <xs:complexType name="linksType">
         <xs:sequence minOccurs="0" maxOccurs="unbounded">
             <xs:element name="link" type="linkType"/>
         </xs:sequence>
     </xs:complexType>
 
-    <xs:complexType name="linksType">
+    <xs:complexType name="exportsType">
         <xs:sequence minOccurs="0" maxOccurs="unbounded">
             <xs:element name="link" type="linkType"/>
         </xs:sequence>
     </xs:complexType>
 
+    <xs:complexType name="urlTypes">
+        <xs:annotation>
+            <xs:documentation>
+                The array of the configuration for urls types to be displayed in the list for selection.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:attribute name="class" use="required" type="xs:string">
+            <xs:annotation>
+                <xs:documentation>
+                    Path to the PHP class that provides configuration.
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+
     <xs:complexType name="listensType">
         <xs:sequence minOccurs="0" maxOccurs="unbounded">
             <xs:element name="link" type="linkType"/>
diff --git a/app/code/Magento/Ui/view/base/ui_component/etc/definition/urlInput.xsd b/app/code/Magento/Ui/view/base/ui_component/etc/definition/urlInput.xsd
new file mode 100644
index 00000000000..98918d92944
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/ui_component/etc/definition/urlInput.xsd
@@ -0,0 +1,74 @@
+<?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">
+    <!-- Include section -->
+    <xs:include schemaLocation="urn:magento:module:Magento_Ui:view/base/ui_component/etc/definition/ui_component.xsd"/>
+
+    <xs:complexType name="componentUrlInput">
+        <xs:sequence>
+            <xs:group ref="configurable" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="settings" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                    <xs:choice minOccurs="0" maxOccurs="unbounded">
+                        <xs:group ref="componentUrlInputSettings"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attributeGroup ref="ui_element_attributes"/>
+    </xs:complexType>
+
+    <xs:group name="componentUrlInputSettings">
+        <xs:choice>
+            <xs:group ref="abstractSettings"/>
+            <xs:element ref="scopeLabel"/>
+            <xs:element name="urlTypes" type="urlTypes">
+                <xs:annotation>
+                    <xs:documentation>
+                        Options for "urlInput" element
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="settingTemplate" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        The path to the custom url setting ".html" template.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="typeSelectorTemplate" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>
+                        The path to the custom url types selector ".html" template.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="settingLabel" type="translatableString">
+                <xs:annotation>
+                    <xs:documentation>
+                        The label for custom url setting.
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="isDisplayAdditionalSettings" type="xs:boolean">
+                <xs:annotation>
+                    <xs:documentation>
+                        Allows to specify if display additional settings
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="settingValue" type="xs:boolean">
+                <xs:annotation>
+                    <xs:documentation>
+                        Allows to specify default value for setting
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:choice>
+    </xs:group>
+</xs:schema>
diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows-grid.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows-grid.js
index c707c504e23..eb37739e615 100644
--- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows-grid.js
+++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows-grid.js
@@ -124,7 +124,7 @@ define([
             prop = this.map[this.identificationDRProperty];
 
             this.insertData(_.reject(this.source.get(this.dataProvider), function (recordData) {
-                return ~~recordData[prop] === ~~data[prop];
+                return recordData[prop].toString() === data[prop].toString();
             }, this));
         },
 
diff --git a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
index 01fa03d1b4b..635c78ce65f 100644
--- a/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
+++ b/app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js
@@ -547,7 +547,6 @@ define([
                         columnsHeaderClasses: cell.config.columnsHeaderClasses,
                         sortOrder: cell.config.sortOrder
                     });
-
                     labels.push(data);
                 }, this);
                 this.labels(_.sortBy(labels, 'sortOrder'));
@@ -903,7 +902,7 @@ define([
             prop = prop || this.identificationProperty;
 
             return _.reject(this.getChildItems(), function (recordData) {
-                return ~~recordData[prop] === ~~id;
+                return recordData[prop].toString() === id.toString();
             }, this);
         },
 
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/url-input.js b/app/code/Magento/Ui/view/base/web/js/form/element/url-input.js
new file mode 100644
index 00000000000..1365e19a8e5
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/url-input.js
@@ -0,0 +1,162 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @api
+ */
+define([
+    'underscore',
+    'uiLayout',
+    'mage/translate',
+    'Magento_Ui/js/form/element/abstract'
+], function (_, layout, $t, Abstract) {
+    'use strict';
+
+    return Abstract.extend({
+        defaults: {
+            linkedElement: {},
+            settingTemplate: 'ui/form/element/urlInput/setting',
+            typeSelectorTemplate: 'ui/form/element/urlInput/typeSelector',
+            options: [],
+            linkedElementInstances: {},
+            //checkbox
+            isDisplayAdditionalSettings: true,
+            settingValue: false,
+            settingLabel: $t('Open in new tab'),
+            tracks: {
+                linkedElement: true
+            },
+            baseLinkSetting: {
+                namePrefix: '${$.name}.',
+                dataScopePrefix: '${$.dataScope}.',
+                provider: '${$.provider}'
+            },
+            urlTypes: {},
+            listens: {
+                settingValue: 'checked',
+                disabled: 'hideLinkedElement',
+                linkType: 'createChildUrlInputComponent'
+            },
+            links: {
+                linkType: '${$.provider}:${$.dataScope}.type',
+                settingValue: '${$.provider}:${$.dataScope}.setting'
+            }
+        },
+
+        /** @inheritdoc */
+        initConfig: function (config) {
+            var processedLinkTypes = {},
+                baseLinkType = this.constructor.defaults.baseLinkSetting;
+
+            _.each(config.urlTypes, function (linkSettingsArray, linkName) {
+                //add link name by link type
+                linkSettingsArray.name = baseLinkType.namePrefix + linkName;
+                linkSettingsArray.dataScope = baseLinkType.dataScopePrefix + linkName;
+                linkSettingsArray.type = linkName;
+                processedLinkTypes[linkName] = {};
+                _.extend(processedLinkTypes[linkName], baseLinkType, linkSettingsArray);
+            });
+            _.extend(this.constructor.defaults.urlTypes, processedLinkTypes);
+
+            this._super();
+        },
+
+        /**
+         * Initializes observable properties of instance
+         *
+         * @returns {Abstract} Chainable.
+         */
+        initObservable: function () {
+            this._super()
+                .observe('componentTemplate options value linkType settingValue checked isDisplayAdditionalSettings')
+                .setOptions();
+
+            return this;
+        },
+
+        /**
+         * Set options to select based on link types configuration
+         *
+         * @return {Object}
+         */
+        setOptions: function () {
+            var result = [];
+
+            _.each(this.urlTypes, function (option, key) {
+                result.push({
+                    value: key,
+                    label: option.label,
+                    sortOrder: option.sortOrder || 0
+                });
+            });
+
+            //sort options by sortOrder
+            result.sort(function (a, b) {
+                return a.sortOrder > b.sortOrder ? 1 : -1;
+            });
+
+            this.options(result);
+
+            return this;
+        },
+
+        /** @inheritdoc */
+        setPreview: function (visible) {
+            this.linkedElement().visible(visible);
+        },
+
+        /**
+         * Initializes observable properties of instance
+         *
+         * @param {Boolean} disabled
+         */
+        hideLinkedElement: function (disabled) {
+            this.linkedElement().disabled(disabled);
+        },
+
+        /** @inheritdoc */
+        destroy: function () {
+            _.each(this.linkedElementInstances, function (value) {
+                value().destroy();
+            });
+            this._super();
+        },
+
+        /**
+         * Create child component by value
+         *
+         * @param {String} value
+         * @return void
+         */
+        createChildUrlInputComponent: function (value) {
+            var elementConfig;
+
+            if (_.isUndefined(this.linkedElementInstances[value])) {
+                elementConfig = this.urlTypes[value];
+                layout([elementConfig]);
+                this.linkedElementInstances[value] = this.requestModule(elementConfig.name);
+            }
+            this.linkedElement = this.linkedElementInstances[value];
+
+        },
+
+        /**
+         * Returns linked element to display related field in template
+         * @return String
+         */
+        getLinkedElementName: function () {
+            return this.linkedElement;
+        },
+
+        /**
+         * Add ability to choose check box by clicking on label
+         */
+        checkboxClick: function () {
+            if (!this.disabled()) {
+                this.settingValue(!this.settingValue());
+            }
+        }
+    });
+});
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js b/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
index 0ffd65c47d4..8f276223b6e 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js
@@ -963,6 +963,12 @@ define([
                 return moment.utc(value, params.dateFormat).unix() <= maxValue;
             },
             $.mage.__('The date is not within the specified range.')
+        ],
+        'blacklist-url': [
+            function (value, param) {
+                return new RegExp(param).test(value);
+            },
+            $.mage.__('This link is not allowed.')
         ]
     }, function (data) {
         return {
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/view/utils/raf.js b/app/code/Magento/Ui/view/base/web/js/lib/view/utils/raf.js
index 1cbbfb3ecee..3ec0996543c 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/view/utils/raf.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/view/utils/raf.js
@@ -19,6 +19,9 @@ define([
         window.onRequestAnimationFrame ||
         window.msRequestAnimationFrame ||
         function (callback) {
+            if (typeof callback != 'function') {
+                throw new Error('raf argument "callback" must be of type function');
+            }
             window.setTimeout(callback, 1000 / 60);
         };
 
diff --git a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html
index 25917bcbdb5..d0b12549bd6 100644
--- a/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html
+++ b/app/code/Magento/Ui/view/base/web/templates/dynamic-rows/templates/grid.html
@@ -8,14 +8,14 @@
 <div class="admin__field"
      visible="visible"
      disable="disabled"
-     css="element.setClasses(element)"
+     css="$data.setClasses($data)"
      attr="'data-index': index">
-    <label if="element.label" class="admin__field-label" attr="for: element.uid">
-        <span translate="element.label"/>
+    <label if="$data.label" class="admin__field-label" attr="for: $data.uid">
+        <span translate="$data.label"/>
     </label>
 
     <div class="admin__field-control" data-role="grid-wrapper">
-        <div class="admin__control-table-pagination" visible="!!element.getRecordCount()">
+        <div class="admin__control-table-pagination" visible="!!$data.getRecordCount()">
             <div class="admin__data-grid-pager">
                 <button class="action-previous" type="button" data-bind="attr: {title: $t('Previous Page')}, click: previousPage, disable: isFirst()"></button>
                 <input class="admin__control-text" type="number" data-bind="attr: {id: ++ko.uid}, value: currentPage">
@@ -33,7 +33,7 @@
                 </div>
             </div>
             <table class="admin__dynamic-rows data-grid" data-role="grid">
-                <thead if="element.columnsHeader">
+                <thead if="$data.columnsHeader">
                 <tr>
                     <th if="dndConfig.enabled"
                         class="data-grid-draggable-row-cell"/>
@@ -69,7 +69,7 @@
             </table>
         </div>
 
-        <div class="admin__control-table-action" if="element.addButton">
+        <div class="admin__control-table-action" if="$data.addButton">
             <button attr="{disabled: disabled}"
                     type="button"
                     click="addChild.bind($data, false, false)">
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/helper/tooltip.html b/app/code/Magento/Ui/view/base/web/templates/form/element/helper/tooltip.html
index 3d41fc41fe2..c57678a91a6 100644
--- a/app/code/Magento/Ui/view/base/web/templates/form/element/helper/tooltip.html
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/helper/tooltip.html
@@ -6,5 +6,5 @@
 -->
 <div class="admin__field-tooltip">
     <a class="admin__field-tooltip-action action-help" target="_blank" tabindex="1" attr="href: tooltip.link"/>
-    <div class="admin__field-tooltip-content" text="tooltip.description"/>
+    <div class="admin__field-tooltip-content" html="tooltip.description"/>
 </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/url-input.html b/app/code/Magento/Ui/view/base/web/templates/form/element/url-input.html
new file mode 100644
index 00000000000..412184b751a
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/url-input.html
@@ -0,0 +1,30 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<!--render select with link types-->
+<div class="admin__field url-input-container"
+     visible="visible"
+     css="$data.additionalClasses"
+     attr="'data-index': index">
+    <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 link types select-->
+            <render args="typeSelectorTemplate"/>
+
+            <!--display field to insert link value based on link type-->
+            <div ko-scope="getLinkedElementName()" class="url-input-element-linked-element">
+                <render/>
+                <label class="admin__field-error" visible="error" attr="for: uid" text="error"/>
+            </div>
+
+        <!--display container to specify url options(Example: open in new tab)-->
+        <div render="settingTemplate" if="isDisplayAdditionalSettings"/>
+    </div>
+</div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/urlInput/setting.html b/app/code/Magento/Ui/view/base/web/templates/form/element/urlInput/setting.html
new file mode 100644
index 00000000000..5d4818fa569
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/urlInput/setting.html
@@ -0,0 +1,18 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<!--display container to specify url options(Example: open in new tab)-->
+<div class="admin__field admin__field-option url-input-setting" visible="visible" click="checkboxClick">
+    <input type="checkbox"
+           class="admin__control-checkbox"
+           ko-checked="settingValue"
+           disable="disabled"
+           ko-value="settingValue"
+           hasFocus="focused"
+           attr="id: uid, name: inputName"/>
+
+    <label class="admin__field-label" text="settingLabel" attr="for: uid"/>
+</div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/element/urlInput/typeSelector.html b/app/code/Magento/Ui/view/base/web/templates/form/element/urlInput/typeSelector.html
new file mode 100644
index 00000000000..95a87a2789d
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/templates/form/element/urlInput/typeSelector.html
@@ -0,0 +1,19 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<select class="admin__control-select url-input-select" data-bind="
+    attr: {
+        name: inputName,
+        id: uid,
+        disabled: disabled,
+        visible: visible,
+        'aria-describedby': noticeId
+    },
+    hasFocus: focused,
+    optgroup: options,
+    value: linkType,
+    optionsValue: 'value',
+    optionsText: 'label'"/>
\ No newline at end of file
diff --git a/app/code/Magento/Ups/Test/Unit/Model/CarrierCollectRatesOptionsTest.php b/app/code/Magento/Ups/Test/Unit/Model/CarrierCollectRatesOptionsTest.php
index e5bf27b154a..854f14f1b48 100644
--- a/app/code/Magento/Ups/Test/Unit/Model/CarrierCollectRatesOptionsTest.php
+++ b/app/code/Magento/Ups/Test/Unit/Model/CarrierCollectRatesOptionsTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Ups\Test\Unit\Model;
 
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
diff --git a/app/code/Magento/UrlRewrite/Controller/Router.php b/app/code/Magento/UrlRewrite/Controller/Router.php
index 66ba3d9bbab..73002c10cf1 100644
--- a/app/code/Magento/UrlRewrite/Controller/Router.php
+++ b/app/code/Magento/UrlRewrite/Controller/Router.php
@@ -5,10 +5,16 @@
  */
 namespace Magento\UrlRewrite\Controller;
 
+use Magento\Framework\App\RequestInterface;
 use Magento\UrlRewrite\Controller\Adminhtml\Url\Rewrite;
 use Magento\UrlRewrite\Model\OptionProvider;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\App\Response\Http as HttpResponse;
+use Magento\Framework\UrlInterface;
+use Magento\Framework\App\Action\Redirect;
+use Magento\Framework\App\ActionInterface;
 
 /**
  * UrlRewrite Controller Router
@@ -23,7 +29,7 @@ class Router implements \Magento\Framework\App\RouterInterface
     protected $actionFactory;
 
     /**
-     * @var \Magento\Framework\UrlInterface
+     * @var UrlInterface
      */
     protected $url;
 
@@ -33,7 +39,7 @@ class Router implements \Magento\Framework\App\RouterInterface
     protected $storeManager;
 
     /**
-     * @var \Magento\Framework\App\ResponseInterface
+     * @var HttpResponse
      */
     protected $response;
 
@@ -44,14 +50,14 @@ class Router implements \Magento\Framework\App\RouterInterface
 
     /**
      * @param \Magento\Framework\App\ActionFactory $actionFactory
-     * @param \Magento\Framework\UrlInterface $url
+     * @param UrlInterface $url
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\ResponseInterface $response
      * @param UrlFinderInterface $urlFinder
      */
     public function __construct(
         \Magento\Framework\App\ActionFactory $actionFactory,
-        \Magento\Framework\UrlInterface $url,
+        UrlInterface $url,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\ResponseInterface $response,
         UrlFinderInterface $urlFinder
@@ -64,48 +70,83 @@ public function __construct(
     }
 
     /**
-     * Match corresponding URL Rewrite and modify request
+     * Match corresponding URL Rewrite and modify request.
      *
-     * @param \Magento\Framework\App\RequestInterface $request
-     * @return \Magento\Framework\App\ActionInterface|null
+     * @param RequestInterface|HttpRequest $request
+     *
+     * @return ActionInterface|null
      */
-    public function match(\Magento\Framework\App\RequestInterface $request)
+    public function match(RequestInterface $request)
     {
         if ($fromStore = $request->getParam('___from_store')) {
+            //If we're in the process of switching stores then matching rewrite
+            //rule from previous store because the URL was not changed yet from
+            //old store's format.
             $oldStoreId = $this->storeManager->getStore($fromStore)->getId();
-            $oldRewrite = $this->getRewrite($request->getPathInfo(), $oldStoreId);
-            if ($oldRewrite) {
-                $rewrite = $this->urlFinder->findOneByData(
+            $oldRewrite = $this->getRewrite(
+                $request->getPathInfo(),
+                $oldStoreId
+            );
+            if ($oldRewrite && $oldRewrite->getRedirectType() === 0) {
+                //If there is a match and it's a correct URL then just
+                //redirecting to current store's URL equivalent,
+                //otherwise just continuing finding a rule within current store.
+                $currentRewrite = $this->urlFinder->findOneByData(
                     [
                         UrlRewrite::ENTITY_TYPE => $oldRewrite->getEntityType(),
                         UrlRewrite::ENTITY_ID => $oldRewrite->getEntityId(),
-                        UrlRewrite::STORE_ID => $this->storeManager->getStore()->getId(),
-                        UrlRewrite::IS_AUTOGENERATED => 1,
+                        UrlRewrite::STORE_ID =>
+                            $this->storeManager->getStore()->getId(),
+                        UrlRewrite::REDIRECT_TYPE => 0,
                     ]
                 );
-                if ($rewrite && $rewrite->getRequestPath() !== $oldRewrite->getRequestPath()) {
-                    return $this->redirect($request, $rewrite->getRequestPath(), OptionProvider::TEMPORARY);
+                if ($currentRewrite
+                    && $currentRewrite->getRequestPath()
+                    !== $oldRewrite->getRequestPath()
+                ) {
+                    return $this->redirect(
+                        $request,
+                        $this->url->getUrl(
+                            '',
+                            ['_direct' => $currentRewrite->getRequestPath()]
+                        ),
+                        OptionProvider::TEMPORARY
+                    );
                 }
             }
         }
-        $rewrite = $this->getRewrite($request->getPathInfo(), $this->storeManager->getStore()->getId());
+
+        $rewrite = $this->getRewrite(
+            $request->getPathInfo(),
+            $this->storeManager->getStore()->getId()
+        );
+
         if ($rewrite === null) {
+            //No rewrite rule matching current URl found, continuing with
+            //processing of this URL.
             return null;
         }
-
         if ($rewrite->getRedirectType()) {
+            //Rule requires the request to be redirected to another URL
+            //and cannot be processed further.
             return $this->processRedirect($request, $rewrite);
         }
-
-        $request->setAlias(\Magento\Framework\UrlInterface::REWRITE_REQUEST_PATH_ALIAS, $rewrite->getRequestPath());
+        //Rule provides actual URL that can be processed by a controller.
+        $request->setAlias(
+            UrlInterface::REWRITE_REQUEST_PATH_ALIAS,
+            $rewrite->getRequestPath()
+        );
         $request->setPathInfo('/' . $rewrite->getTargetPath());
-        return $this->actionFactory->create(\Magento\Framework\App\Action\Forward::class);
+        return $this->actionFactory->create(
+            \Magento\Framework\App\Action\Forward::class
+        );
     }
 
     /**
-     * @param \Magento\Framework\App\RequestInterface $request
+     * @param RequestInterface $request
      * @param UrlRewrite $rewrite
-     * @return \Magento\Framework\App\ActionInterface|null
+     *
+     * @return ActionInterface|null
      */
     protected function processRedirect($request, $rewrite)
     {
@@ -119,16 +160,17 @@ protected function processRedirect($request, $rewrite)
     }
 
     /**
-     * @param \Magento\Framework\App\RequestInterface $request
+     * @param RequestInterface|HttpRequest $request
      * @param string $url
      * @param int $code
-     * @return \Magento\Framework\App\ActionInterface
+     * @return ActionInterface
      */
     protected function redirect($request, $url, $code)
     {
         $this->response->setRedirect($url, $code);
         $request->setDispatched(true);
-        return $this->actionFactory->create(\Magento\Framework\App\Action\Redirect::class);
+
+        return $this->actionFactory->create(Redirect::class);
     }
 
     /**
diff --git a/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php b/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php
index acf05242d6a..49300448146 100644
--- a/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php
+++ b/app/code/Magento/UrlRewrite/Test/Unit/Controller/RouterTest.php
@@ -76,51 +76,6 @@ public function testNoRewriteExist()
         $this->assertNull($this->router->match($this->request));
     }
 
-    public function testRewriteAfterStoreSwitcher()
-    {
-        $this->request->expects($this->any())->method('getPathInfo')->will($this->returnValue('request-path'));
-        $this->request->expects($this->any())->method('getParam')->with('___from_store')
-            ->will($this->returnValue('old-store'));
-        $oldStore = $this->getMockBuilder(\Magento\Store\Model\Store::class)->disableOriginalConstructor()->getMock();
-        $this->storeManager->expects($this->any())->method('getStore')
-            ->will($this->returnValueMap([['old-store', $oldStore], [null, $this->store]]));
-        $oldStore->expects($this->any())->method('getId')->will($this->returnValue('old-store-id'));
-        $this->store->expects($this->any())->method('getId')->will($this->returnValue('current-store-id'));
-        $oldUrlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
-            ->disableOriginalConstructor()->getMock();
-        $oldUrlRewrite->expects($this->any())->method('getEntityType')->will($this->returnValue('entity-type'));
-        $oldUrlRewrite->expects($this->any())->method('getEntityId')->will($this->returnValue('entity-id'));
-        $oldUrlRewrite->expects($this->any())->method('getRequestPath')->will($this->returnValue('old-request-path'));
-        $urlRewrite = $this->getMockBuilder(\Magento\UrlRewrite\Service\V1\Data\UrlRewrite::class)
-            ->disableOriginalConstructor()->getMock();
-        $urlRewrite->expects($this->any())->method('getRequestPath')->will($this->returnValue('new-request-path'));
-
-        $this->urlFinder->expects($this->any())->method('findOneByData')->will(
-            $this->returnValueMap([
-                [
-                    [UrlRewrite::REQUEST_PATH => 'request-path', UrlRewrite::STORE_ID => 'old-store-id'],
-                    $oldUrlRewrite,
-                ],
-                [
-                    [
-                        UrlRewrite::ENTITY_TYPE => 'entity-type',
-                        UrlRewrite::ENTITY_ID => 'entity-id',
-                        UrlRewrite::STORE_ID => 'current-store-id',
-                        UrlRewrite::IS_AUTOGENERATED => 1,
-                    ],
-                    $urlRewrite
-                ],
-            ])
-        );
-        $this->response->expects($this->once())->method('setRedirect')
-            ->with('new-request-path', OptionProvider::TEMPORARY);
-        $this->request->expects($this->once())->method('setDispatched')->with(true);
-        $this->actionFactory->expects($this->once())->method('create')
-            ->with(\Magento\Framework\App\Action\Redirect::class);
-
-        $this->router->match($this->request);
-    }
-
     public function testNoRewriteAfterStoreSwitcherWhenNoOldRewrite()
     {
         $this->request->expects($this->any())->method('getPathInfo')->will($this->returnValue('request-path'));
diff --git a/app/code/Magento/User/view/adminhtml/web/app-config.js b/app/code/Magento/User/view/adminhtml/web/app-config.js
index 0a58d181276..6387bec03ea 100644
--- a/app/code/Magento/User/view/adminhtml/web/app-config.js
+++ b/app/code/Magento/User/view/adminhtml/web/app-config.js
@@ -9,7 +9,6 @@
 require.config({
     'waitSeconds': 0,
     'shim': {
-        'jquery/jquery.hashchange': ['jquery'],
         'jquery/jstree/jquery.hotkeys': ['jquery'],
         'jquery/hover-intent': ['jquery'],
         'mage/adminhtml/backup': ['prototype'],
@@ -28,7 +27,6 @@ require.config({
         'jquery/validate': 'jquery/jquery.validate',
         'jquery/hover-intent': 'jquery/jquery.hoverIntent',
         'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-fp',
-        'jquery/jquery.hashchange': 'jquery/jquery.ba-hashchange.min',
         'prototype': 'prototype/prototype-amd',
         'text': 'requirejs/text',
         'domReady': 'requirejs/domReady',
diff --git a/app/code/Magento/Webapi/Controller/Rest/RequestProcessorInterface.php b/app/code/Magento/Webapi/Controller/Rest/RequestProcessorInterface.php
index 43564bba00d..f4340c18e21 100644
--- a/app/code/Magento/Webapi/Controller/Rest/RequestProcessorInterface.php
+++ b/app/code/Magento/Webapi/Controller/Rest/RequestProcessorInterface.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Webapi\Controller\Rest;
 
diff --git a/app/code/Magento/Webapi/Controller/Rest/RequestProcessorPool.php b/app/code/Magento/Webapi/Controller/Rest/RequestProcessorPool.php
index a4530021788..3fc7dd6f5c8 100644
--- a/app/code/Magento/Webapi/Controller/Rest/RequestProcessorPool.php
+++ b/app/code/Magento/Webapi/Controller/Rest/RequestProcessorPool.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Webapi\Controller\Rest;
 
diff --git a/app/code/Magento/Webapi/Controller/Rest/SchemaRequestProcessor.php b/app/code/Magento/Webapi/Controller/Rest/SchemaRequestProcessor.php
index f1b6237d090..0f1587c342f 100644
--- a/app/code/Magento/Webapi/Controller/Rest/SchemaRequestProcessor.php
+++ b/app/code/Magento/Webapi/Controller/Rest/SchemaRequestProcessor.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Webapi\Controller\Rest;
 
diff --git a/app/code/Magento/Webapi/Controller/Rest/SynchronousRequestProcessor.php b/app/code/Magento/Webapi/Controller/Rest/SynchronousRequestProcessor.php
index 2495f4bb1c1..f5aa6bd88c3 100644
--- a/app/code/Magento/Webapi/Controller/Rest/SynchronousRequestProcessor.php
+++ b/app/code/Magento/Webapi/Controller/Rest/SynchronousRequestProcessor.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Webapi\Controller\Rest;
 
@@ -18,7 +19,7 @@
  */
 class SynchronousRequestProcessor implements RequestProcessorInterface
 {
-    const PROCESSOR_PATH = "/V\n+/";
+    const PROCESSOR_PATH = "/^\\/V\\d+/";
 
     /**
      * @var RestResponse
@@ -112,7 +113,7 @@ public function process(\Magento\Framework\Webapi\Rest\Request $request)
      */
     public function canProcess(\Magento\Framework\Webapi\Rest\Request $request)
     {
-        if (preg_match(self::PROCESSOR_PATH, ltrim($request->getPathInfo(), '/')) === 0) {
+        if (preg_match(self::PROCESSOR_PATH, $request->getPathInfo()) === 1) {
             return true;
         }
         return false;
diff --git a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
index 6609040b040..aeeb256b99a 100644
--- a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
+++ b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
@@ -862,9 +862,17 @@ private function generateMethodSuccessResponse($parameters, $responses)
             if (isset($parameters['result']['type'])) {
                 $schema = $this->getObjectSchema($parameters['result']['type'], $description);
             }
-            $responses['200']['description'] = '200 Success.';
+
+            // Some methods may have a non-standard HTTP success code.
+            $specificResponseData = $parameters['result']['response_codes']['success'] ?? [];
+            // Default HTTP success code to 200 if nothing has been supplied.
+            $responseCode = $specificResponseData['code'] ?? '200';
+            // Default HTTP response status to 200 Success if nothing has been supplied.
+            $responseDescription = $specificResponseData['description'] ?? '200 Success.';
+
+            $responses[$responseCode]['description'] = $responseDescription;
             if (!empty($schema)) {
-                $responses['200']['schema'] = $schema;
+                $responses[$responseCode]['schema'] = $schema;
             }
         }
         return $responses;
diff --git a/app/code/Magento/Webapi/Test/Unit/Controller/RestTest.php b/app/code/Magento/Webapi/Test/Unit/Controller/RestTest.php
index cea006bcbf3..582d387054e 100644
--- a/app/code/Magento/Webapi/Test/Unit/Controller/RestTest.php
+++ b/app/code/Magento/Webapi/Test/Unit/Controller/RestTest.php
@@ -98,28 +98,28 @@ protected function setUp()
         $this->_requestMock->expects($this->any())->method('getHttpHost')->willReturn('testHostName.com');
         $this->_responseMock = $this->getResponseMock();
         $routerMock = $this->getMockBuilder(\Magento\Webapi\Controller\Rest\Router::class)->setMethods(['match'])
-                           ->disableOriginalConstructor()->getMock();
+            ->disableOriginalConstructor()->getMock();
 
         $this->_routeMock = $this->getRouteMock();
         $this->_serviceMock = $this->getMockBuilder(self::SERVICE_ID)->setMethods([self::SERVICE_METHOD])
-                                   ->disableOriginalConstructor()->getMock();
+            ->disableOriginalConstructor()->getMock();
 
         $this->_oauthServiceMock = $this->getMockBuilder(\Magento\Framework\Oauth\OauthInterface::class)
-                                        ->setMethods(['validateAccessTokenRequest'])->getMockForAbstractClass();
+            ->setMethods(['validateAccessTokenRequest'])->getMockForAbstractClass();
         $this->_authorizationMock = $this->getMockBuilder(\Magento\Framework\Webapi\Authorization::class)
-                                         ->disableOriginalConstructor()->getMock();
+            ->disableOriginalConstructor()->getMock();
 
         $paramsOverriderMock = $this->getMockBuilder(\Magento\Webapi\Controller\Rest\ParamsOverrider::class)
-                                    ->setMethods(['overrideParams'])
-                                    ->disableOriginalConstructor()->getMock();
+            ->setMethods(['overrideParams'])
+            ->disableOriginalConstructor()->getMock();
 
         $dataObjectProcessorMock = $this->getMockBuilder(\Magento\Framework\Reflection\DataObjectProcessor::class)
-                                        ->disableOriginalConstructor()
-                                        ->setMethods(['getMethodReturnType'])
-                                        ->getMockForAbstractClass();
+            ->disableOriginalConstructor()
+            ->setMethods(['getMethodReturnType'])
+            ->getMockForAbstractClass();
 
         $layoutMock = $this->getMockBuilder(\Magento\Framework\View\LayoutInterface::class)
-                           ->disableOriginalConstructor()->getMock();
+            ->disableOriginalConstructor()->getMock();
 
         $errorProcessorMock = $this->createMock(\Magento\Framework\Webapi\ErrorProcessor::class);
         $errorProcessorMock->expects($this->any())->method('maskException')->will($this->returnArgument(0));
@@ -127,7 +127,7 @@ protected function setUp()
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
         $this->serviceInputProcessorMock = $this->getMockBuilder(\Magento\Framework\Webapi\ServiceInputProcessor::class)
-                                                ->disableOriginalConstructor()->setMethods(['process'])->getMock();
+            ->disableOriginalConstructor()->setMethods(['process'])->getMock();
 
         $areaListMock = $this->createMock(\Magento\Framework\App\AreaList::class);
         $areaMock = $this->createMock(\Magento\Framework\App\AreaInterface::class);
@@ -160,7 +160,7 @@ protected function setUp()
 
         $this->_routeMock->expects($this->any())->method('getServiceClass')->will($this->returnValue(self::SERVICE_ID));
         $this->_routeMock->expects($this->any())->method('getServiceMethod')
-                         ->will($this->returnValue(self::SERVICE_METHOD));
+            ->will($this->returnValue(self::SERVICE_METHOD));
 
         $routerMock->expects($this->any())->method('match')->will($this->returnValue($this->_routeMock));
 
@@ -169,8 +169,8 @@ protected function setUp()
         $this->_serviceMock->expects($this->any())->method(self::SERVICE_METHOD)->will($this->returnValue(null));
 
         $dataObjectProcessorMock->expects($this->any())->method('getMethodReturnType')
-                                ->with(self::SERVICE_ID, self::SERVICE_METHOD)
-                                ->will($this->returnValue('null'));
+            ->with(self::SERVICE_ID, self::SERVICE_METHOD)
+            ->will($this->returnValue('null'));
 
         $paramsOverriderMock->expects($this->any())->method('overrideParams')->will($this->returnValue([]));
 
@@ -183,12 +183,12 @@ public function testDispatchSchemaRequest()
             \Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES => 'foo',
         ];
         $this->_requestMock->expects($this->any())
-                           ->method('getPathInfo')
-                           ->willReturn(\Magento\Webapi\Controller\Rest\SchemaRequestProcessor::PROCESSOR_PATH);
+            ->method('getPathInfo')
+            ->willReturn(\Magento\Webapi\Controller\Rest\SchemaRequestProcessor::PROCESSOR_PATH);
 
         $this->_requestMock->expects($this->any())
-                           ->method('getParams')
-                           ->will($this->returnValue($params));
+            ->method('getParams')
+            ->will($this->returnValue($params));
 
         $schema = 'Some REST schema content';
         $this->swaggerGeneratorMock->expects($this->any())->method('generate')->willReturn($schema);
@@ -203,25 +203,25 @@ public function testDispatchAllSchemaRequest()
             \Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES => 'all',
         ];
         $this->_requestMock->expects($this->any())
-                           ->method('getPathInfo')
-                           ->willReturn(\Magento\Webapi\Controller\Rest\SchemaRequestProcessor::PROCESSOR_PATH);
+            ->method('getPathInfo')
+            ->willReturn(\Magento\Webapi\Controller\Rest\SchemaRequestProcessor::PROCESSOR_PATH);
         $this->_requestMock->expects($this->any())
-                           ->method('getParam')
-                           ->will(
-                               $this->returnValueMap([
-                                   [
-                                       \Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES,
-                                       null,
-                                       'all',
-                                   ],
-                               ])
-                           );
+            ->method('getParam')
+            ->will(
+                $this->returnValueMap([
+                    [
+                        \Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES,
+                        null,
+                        'all',
+                    ],
+                ])
+            );
         $this->_requestMock->expects($this->any())
-                           ->method('getParams')
-                           ->will($this->returnValue($params));
+            ->method('getParams')
+            ->will($this->returnValue($params));
         $this->_requestMock->expects($this->any())
-                           ->method('getRequestedServices')
-                           ->will($this->returnValue('all'));
+            ->method('getRequestedServices')
+            ->will($this->returnValue('all'));
 
         $schema = 'Some REST schema content';
         $this->swaggerGeneratorMock->expects($this->any())->method('generate')->willReturn($schema);
@@ -238,9 +238,9 @@ private function getRequestProccessotPoolMock()
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
 
         $this->swaggerGeneratorMock = $this->getMockBuilder(\Magento\Webapi\Model\Rest\Swagger\Generator::class)
-                                           ->disableOriginalConstructor()
-                                           ->setMethods(['generate', 'getListOfServices'])
-                                           ->getMockForAbstractClass();
+            ->disableOriginalConstructor()
+            ->setMethods(['generate', 'getListOfServices'])
+            ->getMockForAbstractClass();
 
         $this->schemaRequestProcessor = $objectManager->getObject(
             \Magento\Webapi\Controller\Rest\SchemaRequestProcessor::class,
@@ -252,9 +252,9 @@ private function getRequestProccessotPoolMock()
 
         $this->synchronousRequestProcessor =
             $this->getMockBuilder(\Magento\Webapi\Controller\Rest\SynchronousRequestProcessor::class)
-                 ->setMethods(['process'])
-                 ->disableOriginalConstructor()
-                 ->getMock();
+                ->setMethods(['process'])
+                ->disableOriginalConstructor()
+                ->getMock();
 
         return $objectManager->getObject(
             \Magento\Webapi\Controller\Rest\RequestProcessorPool::class,
@@ -273,14 +273,14 @@ private function getRequestProccessotPoolMock()
     private function getRouteMock()
     {
         return $this->getMockBuilder(\Magento\Webapi\Controller\Rest\Router\Route::class)
-                    ->setMethods([
-                        'isSecure',
-                        'getServiceMethod',
-                        'getServiceClass',
-                        'getAclResources',
-                        'getParameters',
-                    ])
-                    ->disableOriginalConstructor()->getMock();
+            ->setMethods([
+                'isSecure',
+                'getServiceMethod',
+                'getServiceClass',
+                'getAclResources',
+                'getParameters',
+            ])
+            ->disableOriginalConstructor()->getMock();
     }
 
     /**
@@ -289,18 +289,18 @@ private function getRouteMock()
     private function getRequestMock()
     {
         return $this->getMockBuilder(\Magento\Framework\Webapi\Rest\Request::class)
-                    ->setMethods(
-                        [
-                            'isSecure',
-                            'getRequestData',
-                            'getParams',
-                            'getParam',
-                            'getRequestedServices',
-                            'getPathInfo',
-                            'getHttpHost',
-                            'getMethod',
-                        ]
-                    )->disableOriginalConstructor()->getMock();
+            ->setMethods(
+                [
+                    'isSecure',
+                    'getRequestData',
+                    'getParams',
+                    'getParam',
+                    'getRequestedServices',
+                    'getPathInfo',
+                    'getHttpHost',
+                    'getMethod',
+                ]
+            )->disableOriginalConstructor()->getMock();
     }
 
     /**
@@ -309,8 +309,8 @@ private function getRequestMock()
     private function getResponseMock()
     {
         return $this->getMockBuilder(\Magento\Framework\Webapi\Rest\Response::class)
-                    ->setMethods(['sendResponse', 'prepareResponse', 'setHeader'])
-                    ->disableOriginalConstructor()
-                    ->getMock();
+            ->setMethods(['sendResponse', 'prepareResponse', 'setHeader'])
+            ->disableOriginalConstructor()
+            ->getMock();
     }
 }
diff --git a/app/code/Magento/WebapiAsync/Code/Generator/Config/RemoteServiceReader/Communication.php b/app/code/Magento/WebapiAsync/Code/Generator/Config/RemoteServiceReader/Communication.php
new file mode 100644
index 00000000000..39e7fa418a3
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Code/Generator/Config/RemoteServiceReader/Communication.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Code\Generator\Config\RemoteServiceReader;
+
+use Magento\Framework\Communication\ConfigInterface as CommunicationConfig;
+use Magento\AsynchronousOperations\Model\ConfigInterface as WebApiAsyncConfig;
+use Magento\Framework\Communication\Config\ReflectionGenerator;
+
+/**
+ * Remote service reader with auto generated configuration for communication.xml
+ */
+class Communication implements \Magento\Framework\Config\ReaderInterface
+{
+
+    /**
+     * @var WebApiAsyncConfig
+     */
+    private $webapiAsyncConfig;
+
+    /**
+     * @var \Magento\Framework\Communication\Config\ReflectionGenerator
+     */
+    private $reflectionGenerator;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param WebApiAsyncConfig $webapiAsyncConfig
+     * @param ReflectionGenerator $reflectionGenerator
+     */
+    public function __construct(
+        WebApiAsyncConfig $webapiAsyncConfig,
+        ReflectionGenerator $reflectionGenerator
+    ) {
+        $this->webapiAsyncConfig = $webapiAsyncConfig;
+        $this->reflectionGenerator = $reflectionGenerator;
+    }
+
+    /**
+     * Generate communication configuration based on remote services declarations
+     *
+     * @param string|null $scope
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function read($scope = null)
+    {
+        $asyncServicesData = $this->webapiAsyncConfig->getServices();
+        $result = [];
+        foreach ($asyncServicesData as $serviceData) {
+            $topicName = $serviceData[WebApiAsyncConfig::SERVICE_PARAM_KEY_TOPIC];
+            $serviceClass = $serviceData[WebApiAsyncConfig::SERVICE_PARAM_KEY_INTERFACE];
+            $serviceMethod = $serviceData[WebApiAsyncConfig::SERVICE_PARAM_KEY_METHOD];
+
+            $topicConfig = $this->reflectionGenerator->generateTopicConfigForServiceMethod(
+                $topicName,
+                $serviceClass,
+                $serviceMethod,
+                [
+                    WebApiAsyncConfig::DEFAULT_HANDLER_NAME => [
+                        CommunicationConfig::HANDLER_TYPE   => $serviceClass,
+                        CommunicationConfig::HANDLER_METHOD => $serviceMethod,
+                    ],
+                ]
+            );
+            $rewriteTopicParams = [
+                CommunicationConfig::TOPIC_IS_SYNCHRONOUS => false,
+                CommunicationConfig::TOPIC_RESPONSE       => null,
+            ];
+            $result[$topicName] = array_merge($topicConfig, $rewriteTopicParams);
+        }
+        $result[WebApiAsyncConfig::SYSTEM_TOPIC_NAME] = WebApiAsyncConfig::SYSTEM_TOPIC_CONFIGURATION;
+
+        return [CommunicationConfig::TOPICS => $result];
+    }
+}
diff --git a/app/code/Magento/WebapiAsync/Code/Generator/Config/RemoteServiceReader/Publisher.php b/app/code/Magento/WebapiAsync/Code/Generator/Config/RemoteServiceReader/Publisher.php
new file mode 100644
index 00000000000..130e55b9ad4
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Code/Generator/Config/RemoteServiceReader/Publisher.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Code\Generator\Config\RemoteServiceReader;
+
+use Magento\AsynchronousOperations\Model\ConfigInterface as WebApiAsyncConfig;
+
+/**
+ * Remote service reader with auto generated configuration for queue_publisher.xml
+ */
+class Publisher implements \Magento\Framework\Config\ReaderInterface
+{
+
+    /**
+     * @var WebApiAsyncConfig
+     */
+    private $webapiAsyncConfig;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param WebApiAsyncConfig $webapiAsyncConfig
+     */
+    public function __construct(
+        WebApiAsyncConfig $webapiAsyncConfig
+    ) {
+        $this->webapiAsyncConfig = $webapiAsyncConfig;
+    }
+
+    /**
+     * Generate publisher configuration based on remote services declarations
+     *
+     * @param string|null $scope
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function read($scope = null)
+    {
+        $asyncServicesData = $this->webapiAsyncConfig->getServices();
+        $result = [];
+        foreach ($asyncServicesData as $serviceData) {
+            $topicName = $serviceData[WebApiAsyncConfig::SERVICE_PARAM_KEY_TOPIC];
+            $result[$topicName] =
+                [
+                    'topic'       => $topicName,
+                    'disabled'    => false,
+                    'connections' => [
+                        'amqp' => [
+                            'name'     => 'amqp',
+                            'exchange' => 'magento',
+                            'disabled' => false,
+                        ],
+                    ],
+                ];
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/WebapiAsync/Controller/Rest/AsynchronousRequestProcessor.php b/app/code/Magento/WebapiAsync/Controller/Rest/AsynchronousRequestProcessor.php
new file mode 100644
index 00000000000..77497565630
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Controller/Rest/AsynchronousRequestProcessor.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Controller\Rest;
+
+use Magento\Framework\Exception\BulkException;
+use Magento\Webapi\Controller\Rest\RequestProcessorInterface;
+use Magento\Framework\Webapi\Rest\Response as RestResponse;
+use Magento\Webapi\Controller\Rest\InputParamsResolver;
+use Magento\AsynchronousOperations\Model\MassSchedule;
+use Magento\AsynchronousOperations\Model\ConfigInterface as WebApiAsyncConfig;
+use Magento\Framework\Reflection\DataObjectProcessor;
+use Magento\AsynchronousOperations\Api\Data\AsyncResponseInterfaceFactory;
+use Magento\AsynchronousOperations\Api\Data\AsyncResponseInterface;
+
+class AsynchronousRequestProcessor implements RequestProcessorInterface
+{
+    const PROCESSOR_PATH = "/^\\/async(\\/V.+)/";
+
+    /**
+     * @var \Magento\Framework\Webapi\Rest\Response
+     */
+    private $response;
+
+    /**
+     * @var InputParamsResolver
+     */
+    private $inputParamsResolver;
+
+    /**
+     * @var MassSchedule
+     */
+    private $asyncBulkPublisher;
+
+    /**
+     * @var WebApiAsyncConfig
+     */
+    private $webapiAsyncConfig;
+
+    /**
+     * @var \Magento\Framework\Reflection\DataObjectProcessor
+     */
+    private $dataObjectProcessor;
+
+    /**
+     * @var AsyncResponseInterfaceFactory
+     */
+    private $asyncResponseFactory;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param RestResponse $response
+     * @param InputParamsResolver $inputParamsResolver
+     * @param MassSchedule $asyncBulkPublisher
+     * @param WebapiAsyncConfig $webapiAsyncConfig
+     * @param DataObjectProcessor $dataObjectProcessor
+     * @param AsyncResponseInterfaceFactory $asyncResponse
+     */
+    public function __construct(
+        RestResponse $response,
+        InputParamsResolver $inputParamsResolver,
+        MassSchedule $asyncBulkPublisher,
+        WebApiAsyncConfig $webapiAsyncConfig,
+        DataObjectProcessor $dataObjectProcessor,
+        AsyncResponseInterfaceFactory $asyncResponse
+    ) {
+        $this->response = $response;
+        $this->inputParamsResolver = $inputParamsResolver;
+        $this->asyncBulkPublisher = $asyncBulkPublisher;
+        $this->webapiAsyncConfig = $webapiAsyncConfig;
+        $this->dataObjectProcessor = $dataObjectProcessor;
+        $this->asyncResponseFactory = $asyncResponse;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(\Magento\Framework\Webapi\Rest\Request $request)
+    {
+        $path = $request->getPathInfo();
+        $path = preg_replace(self::PROCESSOR_PATH, "$1", $path);
+        $request->setPathInfo(
+            $path
+        );
+
+        $entitiesParamsArray = [$this->inputParamsResolver->resolve()];
+        $topicName = $this->getTopicName($request);
+
+        try {
+            $asyncResponse = $this->asyncBulkPublisher->publishMass(
+                $topicName,
+                $entitiesParamsArray
+            );
+        } catch (BulkException $bulkException) {
+            $asyncResponse = $bulkException->getData();
+        }
+
+        $responseData = $this->dataObjectProcessor->buildOutputDataArray(
+            $asyncResponse,
+            AsyncResponseInterface::class
+        );
+
+        $this->response->setStatusCode(RestResponse::STATUS_CODE_202)
+            ->prepareResponse($responseData);
+    }
+
+    /**
+     * @param \Magento\Framework\Webapi\Rest\Request $request
+     * @return string
+     */
+    private function getTopicName($request)
+    {
+        $route = $this->inputParamsResolver->getRoute();
+
+        return $this->webapiAsyncConfig->getTopicName(
+            $route->getRoutePath(),
+            $request->getHttpMethod()
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function canProcess(\Magento\Framework\Webapi\Rest\Request $request)
+    {
+        if ($request->getHttpMethod() === \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET) {
+            return false;
+        }
+
+        if (preg_match(self::PROCESSOR_PATH, $request->getPathInfo()) === 1) {
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/app/code/Magento/WebapiAsync/Controller/Rest/AsynchronousSchemaRequestProcessor.php b/app/code/Magento/WebapiAsync/Controller/Rest/AsynchronousSchemaRequestProcessor.php
new file mode 100644
index 00000000000..6690be0147b
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Controller/Rest/AsynchronousSchemaRequestProcessor.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Controller\Rest;
+
+use Magento\Webapi\Model\Rest\Swagger\Generator;
+use Magento\Framework\Webapi\Rest\Response as RestResponse;
+use Magento\Framework\Webapi\Request;
+use Magento\Webapi\Controller\Rest\RequestProcessorInterface;
+
+class AsynchronousSchemaRequestProcessor implements RequestProcessorInterface
+{
+
+    /**
+     * Path for accessing Async Rest API schema
+     */
+    const PROCESSOR_PATH = 'async/schema';
+
+    /**
+     * @var \Magento\Webapi\Model\Rest\Swagger\Generator
+     */
+    private $swaggerGenerator;
+
+    /**
+     * @var \Magento\Framework\Webapi\Rest\Response
+     */
+    private $response;
+
+    /**
+     * Initial dependencies
+     *
+     * @param \Magento\Webapi\Model\Rest\Swagger\Generator $swaggerGenerator
+     * @param \Magento\Framework\Webapi\Rest\Response $response
+     */
+    public function __construct(
+        Generator $swaggerGenerator,
+        RestResponse $response
+    ) {
+        $this->swaggerGenerator = $swaggerGenerator;
+        $this->response = $response;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(\Magento\Framework\Webapi\Rest\Request $request)
+    {
+        $requestedServices = $request->getRequestedServices('all');
+        $requestedServices = $requestedServices == Request::ALL_SERVICES
+            ? $this->swaggerGenerator->getListOfServices()
+            : $requestedServices;
+        $responseBody = $this->swaggerGenerator->generate(
+            $requestedServices,
+            $request->getScheme(),
+            $request->getHttpHost(),
+            $request->getRequestUri()
+        );
+        $this->response->setBody($responseBody)->setHeader('Content-Type', 'application/json');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function canProcess(\Magento\Framework\Webapi\Rest\Request $request)
+    {
+        if (strpos(ltrim($request->getPathInfo(), '/'), self::PROCESSOR_PATH) === 0) {
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/app/code/Magento/WebapiAsync/LICENSE.txt b/app/code/Magento/WebapiAsync/LICENSE.txt
new file mode 100644
index 00000000000..49525fd99da
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/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/app/code/Magento/WebapiAsync/LICENSE_AFL.txt b/app/code/Magento/WebapiAsync/LICENSE_AFL.txt
new file mode 100644
index 00000000000..f39d641b18a
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/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/app/code/Magento/WebapiAsync/Model/Config.php b/app/code/Magento/WebapiAsync/Model/Config.php
new file mode 100644
index 00000000000..92343027adc
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Model/Config.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Model;
+
+use Magento\Webapi\Model\Cache\Type\Webapi as WebapiCache;
+use Magento\Webapi\Model\Config as WebapiConfig;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Webapi\Model\Config\Converter;
+
+class Config implements \Magento\AsynchronousOperations\Model\ConfigInterface
+{
+    /**
+     * @var \Magento\Webapi\Model\Cache\Type\Webapi
+     */
+    private $cache;
+
+    /**
+     * @var \Magento\Webapi\Model\Config
+     */
+    private $webApiConfig;
+
+    /**
+     * @var \Magento\Framework\Serialize\SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @var array
+     */
+    private $asyncServices;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Webapi\Model\Cache\Type\Webapi $cache
+     * @param \Magento\Webapi\Model\Config $webApiConfig
+     * @param \Magento\Framework\Serialize\SerializerInterface|null $serializer
+     */
+    public function __construct(
+        WebapiCache $cache,
+        WebapiConfig $webApiConfig,
+        SerializerInterface $serializer = null
+    ) {
+        $this->cache = $cache;
+        $this->webApiConfig = $webApiConfig;
+        $this->serializer = $serializer ? : ObjectManager::getInstance()->get(SerializerInterface::class);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getServices()
+    {
+        if (null === $this->asyncServices) {
+            $services = $this->cache->load(self::CACHE_ID);
+            if ($services && is_string($services)) {
+                $this->asyncServices = $this->serializer->unserialize($services);
+            } else {
+                $this->asyncServices = $this->generateTopicsDataFromWebapiConfig();
+                $this->cache->save($this->serializer->serialize($this->asyncServices), self::CACHE_ID);
+            }
+        }
+
+        return $this->asyncServices;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTopicName($routeUrl, $httpMethod)
+    {
+        $services = $this->getServices();
+        $topicName = $this->generateTopicNameByRouteData(
+            $routeUrl,
+            $httpMethod
+        );
+
+        if (array_key_exists($topicName, $services) === false) {
+            throw new LocalizedException(
+                __('WebapiAsync config for "%topicName" does not exist.', ['topicName' => $topicName])
+            );
+        }
+
+        return $services[$topicName][self::SERVICE_PARAM_KEY_TOPIC];
+    }
+
+    /**
+     * @return array
+     */
+    private function generateTopicsDataFromWebapiConfig()
+    {
+        $webApiConfig = $this->webApiConfig->getServices();
+        $services = [];
+        foreach ($webApiConfig[Converter::KEY_ROUTES] as $routeUrl => $routeData) {
+            foreach ($routeData as $httpMethod => $httpMethodData) {
+                if ($httpMethod !== \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET) {
+                    $serviceInterface = $httpMethodData[Converter::KEY_SERVICE][Converter::KEY_SERVICE_CLASS];
+                    $serviceMethod = $httpMethodData[Converter::KEY_SERVICE][Converter::KEY_SERVICE_METHOD];
+
+                    $topicName = $this->generateTopicNameByRouteData(
+                        $routeUrl,
+                        $httpMethod
+                    );
+                    $services[$topicName] = [
+                        self::SERVICE_PARAM_KEY_INTERFACE => $serviceInterface,
+                        self::SERVICE_PARAM_KEY_METHOD    => $serviceMethod,
+                        self::SERVICE_PARAM_KEY_TOPIC     => $topicName,
+                    ];
+                }
+            }
+        }
+
+        return $services;
+    }
+
+    /**
+     * Generate topic name based on service type and method name.
+     *
+     * Perform the following conversion:
+     * self::TOPIC_PREFIX + /V1/products + POST => async.V1.products.POST
+     *
+     * @param string $routeUrl
+     * @param string $httpMethod
+     * @return string
+     */
+    private function generateTopicNameByRouteData($routeUrl, $httpMethod)
+    {
+        return self::TOPIC_PREFIX . $this->generateTopicName($routeUrl, $httpMethod, '/', false);
+    }
+
+    /**
+     * @param string $typeName
+     * @param string $methodName
+     * @param string $delimiter
+     * @param bool $lcfirst
+     * @return string
+     */
+    private function generateTopicName($typeName, $methodName, $delimiter = '\\', $lcfirst = true)
+    {
+        $parts = explode($delimiter, ltrim($typeName, $delimiter));
+        foreach ($parts as &$part) {
+            $part = ltrim($part, ':');
+            if ($lcfirst === true) {
+                $part = lcfirst($part);
+            }
+        }
+
+        return implode('.', $parts) . '.' . $methodName;
+    }
+}
diff --git a/app/code/Magento/WebapiAsync/Model/ServiceConfig.php b/app/code/Magento/WebapiAsync/Model/ServiceConfig.php
new file mode 100644
index 00000000000..aec8f905cd0
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Model/ServiceConfig.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Model;
+
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Webapi\Model\Cache\Type\Webapi as WebapiCache;
+use Magento\WebapiAsync\Model\ServiceConfig\Converter;
+use Magento\WebapiAsync\Model\ServiceConfig\Reader;
+
+/**
+ * This class gives access to consolidated web API configuration from <Module_Name>/etc/webapi_async.xml files.
+ *
+ * @api
+ */
+class ServiceConfig
+{
+    const CACHE_ID = 'webapi_async_config';
+
+    /**
+     * @var WebapiCache
+     */
+    private $cache;
+
+    /**
+     * @var Reader
+     */
+    private $configReader;
+
+    /**
+     * @var array
+     */
+    private $services;
+
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param WebapiCache $cache
+     * @param Reader $configReader
+     * @param SerializerInterface $serializer
+     */
+    public function __construct(
+        WebapiCache $cache,
+        Reader $configReader,
+        SerializerInterface $serializer
+    ) {
+        $this->cache = $cache;
+        $this->configReader = $configReader;
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Return services loaded from cache if enabled or from files merged previously
+     *
+     * @return array
+     */
+    public function getServices()
+    {
+        if (null === $this->services) {
+            $services = $this->cache->load(self::CACHE_ID);
+            if ($services && is_string($services)) {
+                $this->services = $this->serializer->unserialize($services);
+            } else {
+                $this->services = $this->configReader->read()[Converter::KEY_SERVICES] ?? [];
+                $this->cache->save($this->serializer->serialize($this->services), self::CACHE_ID);
+            }
+        }
+        return $this->services;
+    }
+}
diff --git a/app/code/Magento/WebapiAsync/Model/ServiceConfig/Converter.php b/app/code/Magento/WebapiAsync/Model/ServiceConfig/Converter.php
new file mode 100644
index 00000000000..7b9e206aa65
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Model/ServiceConfig/Converter.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Model\ServiceConfig;
+
+/**
+ * Converter of webapi_async.xml content into array format.
+ */
+class Converter implements \Magento\Framework\Config\ConverterInterface
+{
+    /**#@+
+     * Array keys for config internal representation.
+     */
+    const KEY_SERVICES = 'services';
+    const KEY_METHOD = 'method';
+    const KEY_METHODS = 'methods';
+    const KEY_SYNCHRONOUS_INVOCATION_ONLY = 'synchronousInvocationOnly';
+    /**#@-*/
+
+    /**
+     * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     */
+    public function convert($source)
+    {
+        $result = [self::KEY_SERVICES => []];
+        /** @var \DOMNodeList $services */
+        $services = $source->getElementsByTagName('service');
+        /** @var \DOMElement $service */
+        foreach ($services as $service) {
+            if (!$this->canConvertXmlNode($service)) {
+                continue;
+            }
+            $serviceClass = $this->getServiceClass($service);
+            $serviceMethod = $this->getServiceMethod($service);
+
+            // Define the service method's key if this hasn't yet been defined
+            $this->initServiceMethodsKey($result, $serviceClass, $serviceMethod);
+            $this->mergeSynchronousInvocationMethodsData($service, $result, $serviceClass, $serviceMethod);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Merge service data related to synchronous-only method invocations.
+     *
+     * @param \DOMElement $service
+     * @param array $result
+     * @param string $serviceClass
+     * @param string $serviceMethod
+     */
+    private function mergeSynchronousInvocationMethodsData(
+        \DOMElement $service,
+        array &$result,
+        $serviceClass,
+        $serviceMethod
+    ) {
+        $result[self::KEY_SERVICES][$serviceClass][self::KEY_METHODS][$serviceMethod] = array_merge(
+            $result[self::KEY_SERVICES][$serviceClass][self::KEY_METHODS][$serviceMethod],
+            [
+                self::KEY_SYNCHRONOUS_INVOCATION_ONLY => $this->isSynchronousMethodInvocationOnly($service)
+            ]
+        );
+    }
+
+    /**
+     * @param \DOMElement $node
+     * @return bool
+     */
+    private function canConvertXmlNode(\DOMElement $node)
+    {
+        if ($node->nodeType !== XML_ELEMENT_NODE) {
+            return false;
+        }
+
+        if ($this->getServiceClass($node) === null) {
+            return false;
+        }
+
+        if ($this->getServiceMethod($node) === null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Define the methods key against the service. Allows for other types of service information.
+     *
+     * @param array $result
+     * @param string $serviceClass
+     * @param string $serviceMethod
+     */
+    private function initServiceMethodsKey(array &$result, $serviceClass, $serviceMethod)
+    {
+        if (!isset($result[self::KEY_SERVICES][$serviceClass])) {
+            $result[self::KEY_SERVICES][$serviceClass] = [self::KEY_METHODS => []];
+        }
+
+        if (!isset($result[self::KEY_SERVICES][$serviceClass][self::KEY_METHODS][$serviceMethod])) {
+            $result[self::KEY_SERVICES][$serviceClass][self::KEY_METHODS][$serviceMethod] = [];
+        }
+    }
+
+    /**
+     * @param \DOMElement $service
+     * @return null|string
+     */
+    private function getServiceClass(\DOMElement $service)
+    {
+        $serviceClass = $service->attributes->getNamedItem('class')->nodeValue;
+
+        return mb_strlen((string) $serviceClass) === 0 ? null : $serviceClass;
+    }
+
+    /**
+     * @param \DOMElement $service
+     * @return null|string
+     */
+    private function getServiceMethod(\DOMElement $service)
+    {
+        $serviceMethod = $service->attributes->getNamedItem('method')->nodeValue;
+
+        return mb_strlen((string) $serviceMethod) === 0 ? null : $serviceMethod;
+    }
+
+    /**
+     * @param \DOMElement $serviceNode
+     * @return bool
+     */
+    private function isSynchronousMethodInvocationOnly(\DOMElement $serviceNode)
+    {
+        $synchronousInvocationOnlyNodes = $serviceNode->getElementsByTagName('synchronousInvocationOnly');
+
+        return $this->isSynchronousInvocationOnlyTrue($synchronousInvocationOnlyNodes->item(0));
+    }
+
+    /**
+     * @param \DOMElement $synchronousInvocationOnlyNode
+     * @return bool|mixed
+     */
+    private function isSynchronousInvocationOnlyTrue(\DOMElement $synchronousInvocationOnlyNode = null)
+    {
+        if ($synchronousInvocationOnlyNode === null) {
+            return false;
+        }
+
+        if (mb_strlen((string) $synchronousInvocationOnlyNode->nodeValue) === 0) {
+            return true;
+        }
+
+        return filter_var($synchronousInvocationOnlyNode->nodeValue, FILTER_VALIDATE_BOOLEAN);
+    }
+}
diff --git a/app/code/Magento/WebapiAsync/Model/ServiceConfig/Reader.php b/app/code/Magento/WebapiAsync/Model/ServiceConfig/Reader.php
new file mode 100644
index 00000000000..95517463be4
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Model/ServiceConfig/Reader.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Model\ServiceConfig;
+
+/**
+ * Service config data reader.
+ */
+class Reader extends \Magento\Framework\Config\Reader\Filesystem
+{
+    /**
+     * List of id attributes for merge
+     *
+     * @var array
+     */
+    protected $_idAttributes = [
+        '/services/service' => ['class', 'method'],
+    ];
+
+    /**
+     * @param \Magento\Framework\Config\FileResolverInterface $fileResolver
+     * @param Converter $converter
+     * @param 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,
+        Converter $converter,
+        SchemaLocator $schemaLocator,
+        \Magento\Framework\Config\ValidationStateInterface $validationState,
+        $fileName = 'webapi_async.xml',
+        $idAttributes = [],
+        $domDocumentClass = \Magento\Framework\Config\Dom::class,
+        $defaultScope = 'global'
+    ) {
+        parent::__construct(
+            $fileResolver,
+            $converter,
+            $schemaLocator,
+            $validationState,
+            $fileName,
+            $idAttributes,
+            $domDocumentClass,
+            $defaultScope
+        );
+    }
+}
diff --git a/app/code/Magento/WebapiAsync/Model/ServiceConfig/SchemaLocator.php b/app/code/Magento/WebapiAsync/Model/ServiceConfig/SchemaLocator.php
new file mode 100644
index 00000000000..10fdc60a9d5
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Model/ServiceConfig/SchemaLocator.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Model\ServiceConfig;
+
+use Magento\Framework\Module\Dir;
+
+/**
+ * Web API Async config schema locator.
+ */
+class SchemaLocator implements \Magento\Framework\Config\SchemaLocatorInterface
+{
+    /**
+     * Path to corresponding XSD file with validation rules for merged config
+     *
+     * @var string
+     */
+    private $schema = null;
+
+    /**
+     * Path to corresponding XSD file with validation rules for separate config files
+     *
+     * @var string
+     */
+    private $perFileSchema = null;
+
+    /**
+     * @param \Magento\Framework\Module\Dir\Reader $moduleReader
+     */
+    public function __construct(\Magento\Framework\Module\Dir\Reader $moduleReader)
+    {
+        $this->schema = $moduleReader->getModuleDir(Dir::MODULE_ETC_DIR, 'Magento_WebapiAsync') . '/webapi_async.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/app/code/Magento/WebapiAsync/Plugin/ServiceMetadata.php b/app/code/Magento/WebapiAsync/Plugin/ServiceMetadata.php
new file mode 100644
index 00000000000..e91fe8b13aa
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Plugin/ServiceMetadata.php
@@ -0,0 +1,274 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Plugin;
+
+use Magento\Webapi\Model\Config\Converter as WebapiConverter;
+use Magento\AsynchronousOperations\Api\Data\AsyncResponseInterface;
+use Magento\WebapiAsync\Controller\Rest\AsynchronousSchemaRequestProcessor;
+use Magento\WebapiAsync\Model\ServiceConfig\Converter;
+
+class ServiceMetadata
+{
+    /**
+     * @var \Magento\Webapi\Model\Config
+     */
+    private $webapiConfig;
+    /**
+     * @var \Magento\WebapiAsync\Model\ServiceConfig
+     */
+    private $serviceConfig;
+    /**
+     * @var AsynchronousSchemaRequestProcessor
+     */
+    private $asynchronousSchemaRequestProcessor;
+    /**
+     * @var \Magento\Framework\Webapi\Rest\Request
+     */
+    private $request;
+    /**
+     * @var \Magento\Framework\Reflection\TypeProcessor
+     */
+    private $typeProcessor;
+    /**
+     * @var array
+     */
+    private $responseDefinitionReplacement;
+    /**
+     * @var array
+     */
+    private $synchronousOnlyHttpMethods = [
+        'GET'
+    ];
+
+    /**
+     * ServiceMetadata constructor.
+     *
+     * @param \Magento\Webapi\Model\Config $webapiConfig
+     * @param \Magento\WebapiAsync\Model\ServiceConfig $serviceConfig
+     * @param AsynchronousSchemaRequestProcessor $asynchronousSchemaRequestProcessor
+     */
+    public function __construct(
+        \Magento\Webapi\Model\Config $webapiConfig,
+        \Magento\WebapiAsync\Model\ServiceConfig $serviceConfig,
+        \Magento\Framework\Webapi\Rest\Request $request,
+        AsynchronousSchemaRequestProcessor $asynchronousSchemaRequestProcessor,
+        \Magento\Framework\Reflection\TypeProcessor $typeProcessor
+    ) {
+        $this->webapiConfig = $webapiConfig;
+        $this->serviceConfig = $serviceConfig;
+        $this->request = $request;
+        $this->asynchronousSchemaRequestProcessor = $asynchronousSchemaRequestProcessor;
+        $this->typeProcessor = $typeProcessor;
+    }
+
+    /**
+     * @param \Magento\Webapi\Model\ServiceMetadata $subject
+     * @param array $result
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    public function afterGetServicesConfig(\Magento\Webapi\Model\ServiceMetadata $subject, array $result)
+    {
+        if ($this->asynchronousSchemaRequestProcessor->canProcess($this->request)) {
+            $synchronousOnlyServiceMethods = $this->getSynchronousOnlyServiceMethods($subject);
+            // Replace all results with the async response schema
+            foreach ($result as $serviceName => $serviceData) {
+                // Check all of the methods on the service
+                foreach ($serviceData[WebapiConverter::KEY_METHODS] as $methodName => $methodData) {
+                    // Exclude service methods that are marked as synchronous only
+                    if ($this->isServiceMethodSynchronousOnly(
+                        $serviceName,
+                        $methodName,
+                        $synchronousOnlyServiceMethods
+                    )) {
+                        $this->removeServiceMethodDefinition($result, $serviceName, $methodName);
+                    } else {
+                        $this->replaceResponseDefinition($result, $serviceName, $methodName);
+                    }
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param $serviceName
+     * @param $methodName
+     * @param array $synchronousOnlyServiceMethods
+     * @return bool
+     */
+    private function isServiceMethodSynchronousOnly($serviceName, $methodName, array $synchronousOnlyServiceMethods)
+    {
+        return isset($synchronousOnlyServiceMethods[$serviceName][$methodName]);
+    }
+
+    /**
+     * @param string $serviceName
+     * @return array
+     */
+    private function getServiceVersions(string $serviceName)
+    {
+        $services = $this->webapiConfig->getServices();
+
+        return array_keys($services[WebapiConverter::KEY_SERVICES][$serviceName]);
+    }
+
+    /**
+     * Get a list of all service methods that cannot be executed asynchronously.
+     *
+     * @param \Magento\Webapi\Model\ServiceMetadata $serviceMetadata
+     * @return array
+     */
+    private function getSynchronousOnlyServiceMethods(\Magento\Webapi\Model\ServiceMetadata $serviceMetadata)
+    {
+        $synchronousOnlyServiceMethods = [];
+        foreach ($this->serviceConfig->getServices() as $service => $serviceData) {
+            if (!isset($serviceData[Converter::KEY_METHODS])) {
+                continue;
+            }
+
+            foreach ($serviceData[Converter::KEY_METHODS] as $method => $methodData) {
+                if ($this->isMethodDataSynchronousOnly($methodData)) {
+                    $this->appendSynchronousOnlyServiceMethodsWithInterface(
+                        $serviceMetadata,
+                        $synchronousOnlyServiceMethods,
+                        $service,
+                        $method
+                    );
+                }
+            }
+        }
+
+        return array_merge_recursive(
+            $synchronousOnlyServiceMethods,
+            $this->getSynchronousOnlyRoutesAsServiceMethods($serviceMetadata)
+        );
+    }
+
+    /**
+     * Get service methods associated with routes that can't be processed as asynchronous.
+     *
+     * @param \Magento\Webapi\Model\ServiceMetadata $serviceMetadata
+     * @return array
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    private function getSynchronousOnlyRoutesAsServiceMethods(
+        \Magento\Webapi\Model\ServiceMetadata $serviceMetadata
+    ) {
+        $synchronousOnlyServiceMethods = [];
+        $serviceRoutes = $this->webapiConfig->getServices()[\Magento\Webapi\Model\Config\Converter::KEY_ROUTES];
+        foreach ($serviceRoutes as $serviceRoutePath => $serviceRouteMethods) {
+            foreach ($serviceRouteMethods as $serviceRouteMethod => $serviceRouteMethodData) {
+                // Check if the HTTP method associated with the route is not able to be async.
+                if (in_array(strtoupper($serviceRouteMethod), $this->synchronousOnlyHttpMethods)) {
+                    $this->appendSynchronousOnlyServiceMethodsWithInterface(
+                        $serviceMetadata,
+                        $synchronousOnlyServiceMethods,
+                        $serviceRouteMethodData[WebapiConverter::KEY_SERVICE][WebapiConverter::KEY_SERVICE_CLASS],
+                        $serviceRouteMethodData[WebapiConverter::KEY_SERVICE][WebapiConverter::KEY_SERVICE_METHOD]
+                    );
+                }
+            }
+        }
+
+        return $synchronousOnlyServiceMethods;
+    }
+
+    /**
+     * @param \Magento\Webapi\Model\ServiceMetadata $serviceMetadata
+     * @param array $synchronousOnlyServiceMethods
+     * @param $serviceInterface
+     * @param $serviceMethod
+     */
+    private function appendSynchronousOnlyServiceMethodsWithInterface(
+        \Magento\Webapi\Model\ServiceMetadata $serviceMetadata,
+        array &$synchronousOnlyServiceMethods,
+        $serviceInterface,
+        $serviceMethod
+    ) {
+        foreach ($this->getServiceVersions($serviceInterface) as $serviceVersion) {
+            $serviceName = $serviceMetadata->getServiceName($serviceInterface, $serviceVersion);
+            if (!array_key_exists($serviceName, $synchronousOnlyServiceMethods)) {
+                $synchronousOnlyServiceMethods[$serviceName] = [];
+            }
+
+            $synchronousOnlyServiceMethods[$serviceName][$serviceMethod] = true;
+        }
+    }
+
+    /**
+     * @param array $result
+     * @param $serviceName
+     * @param $methodName
+     */
+    private function removeServiceMethodDefinition(array &$result, $serviceName, $methodName)
+    {
+        unset($result[$serviceName][WebapiConverter::KEY_METHODS][$methodName]);
+
+        // Remove the service altogether if there is no methods left.
+        if (count($result[$serviceName][WebapiConverter::KEY_METHODS]) === 0) {
+            unset($result[$serviceName]);
+        }
+    }
+
+    /**
+     * @param array $result
+     * @param $serviceName
+     * @param $methodName
+     */
+    private function replaceResponseDefinition(array &$result, $serviceName, $methodName)
+    {
+        if (isset($result[$serviceName][WebapiConverter::KEY_METHODS][$methodName]['interface']['out'])) {
+            $replacement = $this->getResponseDefinitionReplacement();
+            $result[$serviceName][WebapiConverter::KEY_METHODS][$methodName]['interface']['out'] = $replacement;
+        }
+    }
+
+    /**
+     * Check if a method on the given service is defined as synchronous only using XML.
+     *
+     * @param array $methodData
+     * @return bool
+     */
+    private function isMethodDataSynchronousOnly(array $methodData)
+    {
+        if (!isset($methodData[Converter::KEY_SYNCHRONOUS_INVOCATION_ONLY])) {
+            return false;
+        }
+
+        return $methodData[Converter::KEY_SYNCHRONOUS_INVOCATION_ONLY];
+    }
+
+    /**
+     * @return array
+     */
+    private function getResponseDefinitionReplacement()
+    {
+        if ($this->responseDefinitionReplacement === null) {
+            $this->responseDefinitionReplacement = [
+                'parameters' => [
+                    'result' => [
+                        'type' => $this->typeProcessor->register(AsyncResponseInterface::class),
+                        'documentation' => 'Returns response information for the asynchronous request.',
+                        'required' => true,
+                        'response_codes' => [
+                            'success' => [
+                                'code' => '202',
+                                'description' => '202 Accepted.'
+                            ]
+                        ]
+                    ]
+                ]
+            ];
+        }
+
+        return $this->responseDefinitionReplacement;
+    }
+}
diff --git a/app/code/Magento/WebapiAsync/README.md b/app/code/Magento/WebapiAsync/README.md
new file mode 100644
index 00000000000..ed57634e77c
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/README.md
@@ -0,0 +1,3 @@
+# WebapiAsync
+
+**WebapiAsync** Extends Webapi extension and provide functional to process asynchronous requests. It handle asynchronous requests, schedule, publish and consum bulk operations from queue.
diff --git a/app/code/Magento/WebapiAsync/Test/Unit/Controller/PathProcessorTest.php b/app/code/Magento/WebapiAsync/Test/Unit/Controller/PathProcessorTest.php
new file mode 100644
index 00000000000..935ef0e8c96
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Unit/Controller/PathProcessorTest.php
@@ -0,0 +1,68 @@
+<?php
+/***
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Test\Unit\Controller;
+
+use Magento\Store\Model\Store;
+
+class PathProcessorTest extends \PHPUnit\Framework\TestCase
+{
+    /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Store\Model\StoreManagerInterface */
+    private $storeManagerMock;
+
+    /** @var \Magento\Webapi\Controller\PathProcessor */
+    private $model;
+
+    /** @var string */
+    private $arbitraryStoreCode = 'myStoreCode';
+
+    /** @var string */
+    private $endpointPath = '/async/V1/path/of/endpoint';
+
+    protected function setUp()
+    {
+        $this->storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+           ->disableOriginalConstructor()
+           ->getMock();
+        $this->storeManagerMock->expects($this->once())
+           ->method('getStores')
+           ->willReturn([
+               $this->arbitraryStoreCode => 'store object',
+               'default' => 'default store object',
+           ]);
+        $this->model = new \Magento\Webapi\Controller\PathProcessor($this->storeManagerMock);
+    }
+
+    /**
+     * @dataProvider processPathDataProvider
+     *
+     * @param string $storeCodeInPath
+     * @param string $storeCodeSet
+     * @param int $setCurrentStoreCallCtr
+     */
+    public function testAllStoreCode($storeCodeInPath, $storeCodeSet, $setCurrentStoreCallCtr = 1)
+    {
+        $storeCodeInPath = !$storeCodeInPath ? : '/' . $storeCodeInPath; // add leading slash if store code not empty
+        $inPath = 'rest' . $storeCodeInPath . $this->endpointPath;
+        $this->storeManagerMock->expects($this->exactly($setCurrentStoreCallCtr))
+           ->method('setCurrentStore')
+           ->with($storeCodeSet);
+        $result = $this->model->process($inPath);
+        $this->assertSame($this->endpointPath, $result);
+    }
+
+    public function processPathDataProvider()
+    {
+        return [
+            'All store code'              => ['all', Store::ADMIN_CODE],
+            'Default store code'          => ['', 'default', 0],
+            'Arbitrary store code'        => [$this->arbitraryStoreCode, $this->arbitraryStoreCode],
+            'Explicit default store code' => ['default', 'default'],
+        ];
+    }
+}
diff --git a/app/code/Magento/WebapiAsync/Test/Unit/Controller/RestTest.php b/app/code/Magento/WebapiAsync/Test/Unit/Controller/RestTest.php
new file mode 100644
index 00000000000..29a9992bb7e
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Unit/Controller/RestTest.php
@@ -0,0 +1,322 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Test\Unit\Controller;
+
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Framework\Exception\AuthorizationException;
+use Magento\WebapiAsync\Controller\Rest\AsynchronousSchemaRequestProcessor;
+use Magento\WebapiAsync\Controller\Rest\AsynchronousRequestProcessor;
+
+/**
+ * Test Rest controller.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
+ */
+class RestTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Webapi\Controller\Rest
+     */
+    private $restController;
+
+    /**
+     * @var \Magento\Framework\Webapi\Rest\Request|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var \Magento\Framework\Webapi\Rest\Response|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $responseMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Webapi\Controller\Rest\Router\Route
+     */
+    private $routeMock;
+
+    /**
+     * @var \stdClass|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serviceMock;
+
+    /**
+     * @var \Magento\Framework\Oauth\OauthInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $oauthServiceMock;
+
+    /**
+     * @var \Magento\Framework\Webapi\Authorization|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $authorizationMock;
+
+    /**
+     * @var \Magento\Framework\Webapi\ServiceInputProcessor|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serviceInputProcessorMock;
+
+    /**
+     * @var \Magento\Webapi\Model\Rest\Swagger\Generator | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $swaggerGeneratorMock;
+
+    /**
+     * @var  \Magento\Store\Model\StoreManagerInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManagerMock;
+
+    /**
+     * @var  \Magento\Store\Api\Data\StoreInterface | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeMock;
+
+    /**
+     * @var  \Magento\WebapiAsync\Controller\Rest\AsynchronousSchemaRequestProcessor |
+     *     \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $asyncSchemaRequestProcessor;
+
+    /**
+     * @var  \Magento\WebapiAsync\Controller\Rest\AsynchronousRequestProcessor |
+     *     \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $asyncRequestProcessor;
+
+    /**
+     * @var  \Magento\Webapi\Controller\Rest\RequestProcessorPool | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $requestProcessorPool;
+
+    const SERVICE_METHOD = 'testMethod';
+
+    const SERVICE_ID = \Magento\Webapi\Controller\Rest::class;
+
+    protected function setUp()
+    {
+        $objectManagerMock = $this->createMock(\Magento\Framework\ObjectManagerInterface::class);
+        $this->requestMock = $this->getRequestMock();
+        $this->requestMock->expects($this->any())->method('getHttpHost')->willReturn('testHostName.com');
+        $this->responseMock = $this->getResponseMock();
+        $routerMock = $this->getMockBuilder(\Magento\Webapi\Controller\Rest\Router::class)->setMethods(['match'])
+            ->disableOriginalConstructor()->getMock();
+
+        $this->routeMock = $this->getRouteMock();
+        $this->serviceMock = $this->getMockBuilder(self::SERVICE_ID)->setMethods([self::SERVICE_METHOD])
+            ->disableOriginalConstructor()->getMock();
+
+        $this->oauthServiceMock = $this->getMockBuilder(\Magento\Framework\Oauth\OauthInterface::class)
+            ->setMethods(['validateAccessTokenRequest'])->getMockForAbstractClass();
+        $this->authorizationMock = $this->getMockBuilder(\Magento\Framework\Webapi\Authorization::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $paramsOverriderMock = $this->getMockBuilder(\Magento\Webapi\Controller\Rest\ParamsOverrider::class)
+            ->setMethods(['overrideParams'])
+            ->disableOriginalConstructor()->getMock();
+
+        $dataObjectProcessorMock = $this->getMockBuilder(\Magento\Framework\Reflection\DataObjectProcessor::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getMethodReturnType'])
+            ->getMockForAbstractClass();
+
+        $layoutMock = $this->getMockBuilder(\Magento\Framework\View\LayoutInterface::class)
+            ->disableOriginalConstructor()->getMock();
+
+        $errorProcessorMock = $this->createMock(\Magento\Framework\Webapi\ErrorProcessor::class);
+        $errorProcessorMock->expects($this->any())->method('maskException')->will($this->returnArgument(0));
+
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->serviceInputProcessorMock = $this->getMockBuilder(\Magento\Framework\Webapi\ServiceInputProcessor::class)
+            ->disableOriginalConstructor()->setMethods(['process'])->getMock();
+
+        $areaListMock = $this->createMock(\Magento\Framework\App\AreaList::class);
+        $areaMock = $this->createMock(\Magento\Framework\App\AreaInterface::class);
+        $areaListMock->expects($this->any())->method('getArea')->will($this->returnValue($areaMock));
+        $this->storeMock = $this->createMock(\Magento\Store\Api\Data\StoreInterface::class);
+        $this->storeManagerMock = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
+        $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($this->storeMock);
+        $this->requestProcessorPool = $this->getRequestProccessotPoolMock();
+
+        $this->restController =
+            $objectManager->getObject(
+                \Magento\Webapi\Controller\Rest::class,
+                [
+                    'request'               => $this->requestMock,
+                    'response'              => $this->responseMock,
+                    'router'                => $routerMock,
+                    'objectManager'         => $objectManagerMock,
+                    'layout'                => $layoutMock,
+                    'oauthService'          => $this->oauthServiceMock,
+                    'authorization'         => $this->authorizationMock,
+                    'serviceInputProcessor' => $this->serviceInputProcessorMock,
+                    'errorProcessor'        => $errorProcessorMock,
+                    'areaList'              => $areaListMock,
+                    'paramsOverrider'       => $paramsOverriderMock,
+                    'dataObjectProcessor'   => $dataObjectProcessorMock,
+                    'storeManager'          => $this->storeManagerMock,
+                    'requestProcessorPool'  => $this->requestProcessorPool,
+                ]
+            );
+
+        $this->routeMock->expects($this->any())->method('getServiceClass')->will($this->returnValue(self::SERVICE_ID));
+        $this->routeMock->expects($this->any())->method('getServiceMethod')
+            ->will($this->returnValue(self::SERVICE_METHOD));
+
+        $routerMock->expects($this->any())->method('match')->will($this->returnValue($this->routeMock));
+
+        $objectManagerMock->expects($this->any())->method('get')->will($this->returnValue($this->serviceMock));
+        $this->responseMock->expects($this->any())->method('prepareResponse')->will($this->returnValue([]));
+        $this->serviceMock->expects($this->any())->method(self::SERVICE_METHOD)->will($this->returnValue(null));
+
+        $dataObjectProcessorMock->expects($this->any())->method('getMethodReturnType')
+            ->with(self::SERVICE_ID, self::SERVICE_METHOD)
+            ->will($this->returnValue('null'));
+
+        $paramsOverriderMock->expects($this->any())->method('overrideParams')->will($this->returnValue([]));
+
+        parent::setUp();
+    }
+
+    public function testDispatchSchemaRequest()
+    {
+        $params = [
+            \Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES => 'foo',
+        ];
+        $this->requestMock->expects($this->any())
+            ->method('getPathInfo')
+            ->willReturn(AsynchronousSchemaRequestProcessor::PROCESSOR_PATH);
+
+        $this->requestMock->expects($this->any())
+            ->method('getParams')
+            ->will($this->returnValue($params));
+
+        $schema = 'Some REST schema content';
+        $this->swaggerGeneratorMock->expects($this->any())->method('generate')->willReturn($schema);
+        $this->requestProcessorPool->getProcessor($this->requestMock)->process($this->requestMock);
+
+        $this->assertEquals($schema, $this->responseMock->getBody());
+    }
+
+    public function testDispatchAllSchemaRequest()
+    {
+        $params = [
+            \Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES => 'all',
+        ];
+        $this->requestMock->expects($this->any())
+            ->method('getPathInfo')
+            ->willReturn(AsynchronousSchemaRequestProcessor::PROCESSOR_PATH);
+        $this->requestMock->expects($this->any())
+            ->method('getParam')
+            ->will(
+                $this->returnValueMap([
+                    [
+                        \Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES,
+                        null,
+                        'all',
+                    ],
+                ])
+            );
+        $this->requestMock->expects($this->any())
+            ->method('getParams')
+            ->will($this->returnValue($params));
+        $this->requestMock->expects($this->any())
+            ->method('getRequestedServices')
+            ->will($this->returnValue('all'));
+
+        $schema = 'Some REST schema content';
+        $this->swaggerGeneratorMock->expects($this->any())->method('generate')->willReturn($schema);
+        $this->requestProcessorPool->getProcessor($this->requestMock)->process($this->requestMock);
+
+        $this->assertEquals($schema, $this->responseMock->getBody());
+    }
+
+    /**
+     * @return object|\Magento\Webapi\Controller\Rest\RequestProcessorPool
+     */
+    private function getRequestProccessotPoolMock()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->swaggerGeneratorMock = $this->getMockBuilder(\Magento\Webapi\Model\Rest\Swagger\Generator::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['generate', 'getListOfServices'])
+            ->getMockForAbstractClass();
+
+        $this->asyncSchemaRequestProcessor = $objectManager->getObject(
+            \Magento\WebapiAsync\Controller\Rest\AsynchronousSchemaRequestProcessor::class,
+            [
+                'swaggerGenerator' => $this->swaggerGeneratorMock,
+                'response'         => $this->responseMock,
+            ]
+        );
+
+        $this->asyncRequestProcessor =
+            $this->getMockBuilder(\Magento\WebapiAsync\Controller\Rest\AsynchronousRequestProcessor::class)
+                ->setMethods(['process'])
+                ->disableOriginalConstructor()
+                ->getMock();
+
+        return $objectManager->getObject(
+            \Magento\Webapi\Controller\Rest\RequestProcessorPool::class,
+            [
+                'requestProcessors' => [
+                    'asyncSchema' => $this->asyncSchemaRequestProcessor,
+                    'async'       => $this->asyncRequestProcessor,
+                ],
+            ]
+        );
+    }
+
+    /**
+     * @return \Magento\Webapi\Controller\Rest\Router\Route | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getRouteMock()
+    {
+        return $this->getMockBuilder(\Magento\Webapi\Controller\Rest\Router\Route::class)
+            ->setMethods([
+                'isSecure',
+                'getServiceMethod',
+                'getServiceClass',
+                'getAclResources',
+                'getParameters',
+            ])
+            ->disableOriginalConstructor()->getMock();
+    }
+
+    /**
+     * @return \Magento\Framework\Webapi\Rest\Request|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getRequestMock()
+    {
+        return $this->getMockBuilder(\Magento\Framework\Webapi\Rest\Request::class)
+            ->setMethods(
+                [
+                    'isSecure',
+                    'getRequestData',
+                    'getParams',
+                    'getParam',
+                    'getRequestedServices',
+                    'getPathInfo',
+                    'getHttpHost',
+                    'getMethod',
+                ]
+            )->disableOriginalConstructor()->getMock();
+    }
+
+    /**
+     * @return \Magento\Framework\Webapi\Rest\Response|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private function getResponseMock()
+    {
+        return $this->getMockBuilder(\Magento\Framework\Webapi\Rest\Response::class)
+            ->setMethods(['sendResponse', 'prepareResponse', 'setHeader'])
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+}
diff --git a/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/ConverterTest.php b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/ConverterTest.php
new file mode 100644
index 00000000000..105bc824351
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/ConverterTest.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Test\Unit\Model\ServiceConfig;
+
+class ConverterTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\WebapiAsync\Model\ServiceConfig\Converter
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->model = new \Magento\WebapiAsync\Model\ServiceConfig\Converter();
+    }
+
+    /**
+     * @covers \Magento\WebapiAsync\Model\ServiceConfig\Converter::convert()
+     */
+    public function testConvert()
+    {
+        $inputData = new \DOMDocument();
+        $inputData->load(__DIR__ . '/_files/Converter/webapi_async.xml');
+        $expectedResult = require __DIR__ . '/_files/Converter/webapi_async.php';
+        $this->assertEquals($expectedResult, $this->model->convert($inputData));
+    }
+}
diff --git a/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/ReaderTest.php b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/ReaderTest.php
new file mode 100644
index 00000000000..cff605452aa
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/ReaderTest.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Test\Unit\Model\ServiceConfig;
+
+use Magento\Framework\Config\FileResolverInterface;
+use Magento\WebapiAsync\Model\ServiceConfig\Converter;
+use Magento\WebapiAsync\Model\ServiceConfig\Reader;
+
+class ReaderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Reader
+     */
+    private $reader;
+
+    /**
+     * @var FileResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $fileResolver;
+
+    public function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $this->fileResolver = $this
+            ->getMockForAbstractClass(\Magento\Framework\Config\FileResolverInterface::class);
+
+        $this->reader = $objectManager->getObject(
+            Reader::class,
+            [
+                'fileResolver' => $this->fileResolver,
+                'converter' => $objectManager->getObject(Converter::class),
+            ]
+        );
+    }
+
+    /**
+     * @covers \Magento\WebapiAsync\Model\ServiceConfig\Reader::read()
+     */
+    public function testReader()
+    {
+        $this->fileResolver->expects($this->once())
+            ->method('get')
+            ->with('webapi_async.xml', 'global')->willReturn([
+                file_get_contents(__DIR__ . '/_files/Reader/webapi_async_1.xml'),
+                file_get_contents(__DIR__ . '/_files/Reader/webapi_async_2.xml'),
+            ]);
+
+        $mergedConfiguration = include __DIR__ . '/_files/Reader/webapi_async.php';
+        $readConfiguration = $this->reader->read();
+
+        $this->assertEquals($mergedConfiguration, $readConfiguration);
+    }
+}
diff --git a/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/SchemaLocatorTest.php b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/SchemaLocatorTest.php
new file mode 100644
index 00000000000..f5c15b8d371
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/SchemaLocatorTest.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Test\Unit\Model\ServiceConfig;
+
+class SchemaLocatorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $moduleReaderMock;
+
+    /**
+     * @var \Magento\WebapiAsync\Model\ServiceConfig\SchemaLocator
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $this->moduleReaderMock = $this->createPartialMock(
+            \Magento\Framework\Module\Dir\Reader::class,
+            ['getModuleDir']
+        );
+        $this->moduleReaderMock->expects(
+            $this->any()
+        )->method(
+            'getModuleDir'
+        )->with(
+            'etc',
+            'Magento_WebapiAsync'
+        )->will(
+            $this->returnValue('schema_dir')
+        );
+
+        $this->model = new \Magento\WebapiAsync\Model\ServiceConfig\SchemaLocator($this->moduleReaderMock);
+    }
+
+    public function testGetSchema()
+    {
+        $this->assertEquals('schema_dir/webapi_async.xsd', $this->model->getSchema());
+    }
+
+    public function testGetPerFileSchema()
+    {
+        $this->assertEquals(null, $this->model->getPerFileSchema());
+    }
+}
diff --git a/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/_files/Converter/webapi_async.php b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/_files/Converter/webapi_async.php
new file mode 100644
index 00000000000..cbe3b5522f1
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/_files/Converter/webapi_async.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+return [
+    'services' => [
+        \Magento\Customer\Api\CustomerRepositoryInterface::class => [
+            'methods' => [
+                'getById' => [
+                    'synchronousInvocationOnly' => true,
+                ],
+                'save' => [
+                    'synchronousInvocationOnly' => true,
+                ],
+                'get' => [
+                    'synchronousInvocationOnly' => false,
+                ],
+            ],
+        ],
+    ],
+];
diff --git a/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/_files/Converter/webapi_async.xml b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/_files/Converter/webapi_async.xml
new file mode 100644
index 00000000000..e4ba6da6233
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/_files/Converter/webapi_async.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_WebapiAsync:etc/webapi_async.xsd">
+    <service class="Magento\Customer\Api\CustomerRepositoryInterface" method="getById">
+        <synchronousInvocationOnly>true</synchronousInvocationOnly>
+    </service>
+
+    <service class="Magento\Customer\Api\CustomerRepositoryInterface" method="save">
+        <synchronousInvocationOnly />
+    </service>
+
+    <service class="Magento\Customer\Api\CustomerRepositoryInterface" method="get" />
+</services>
diff --git a/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/_files/Reader/webapi_async.php b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/_files/Reader/webapi_async.php
new file mode 100644
index 00000000000..cbe3b5522f1
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/_files/Reader/webapi_async.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+return [
+    'services' => [
+        \Magento\Customer\Api\CustomerRepositoryInterface::class => [
+            'methods' => [
+                'getById' => [
+                    'synchronousInvocationOnly' => true,
+                ],
+                'save' => [
+                    'synchronousInvocationOnly' => true,
+                ],
+                'get' => [
+                    'synchronousInvocationOnly' => false,
+                ],
+            ],
+        ],
+    ],
+];
diff --git a/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/_files/Reader/webapi_async_1.xml b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/_files/Reader/webapi_async_1.xml
new file mode 100644
index 00000000000..7f816f510dd
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/_files/Reader/webapi_async_1.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_WebapiAsync:etc/webapi_async.xsd">
+    <service class="Magento\Customer\Api\CustomerRepositoryInterface" method="getById">
+        <synchronousInvocationOnly>true</synchronousInvocationOnly>
+    </service>
+
+    <service class="Magento\Customer\Api\CustomerRepositoryInterface" method="save">
+        <synchronousInvocationOnly />
+    </service>
+
+</services>
diff --git a/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/_files/Reader/webapi_async_2.xml b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/_files/Reader/webapi_async_2.xml
new file mode 100644
index 00000000000..7a5bebd8fe5
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfig/_files/Reader/webapi_async_2.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_WebapiAsync:etc/webapi_async.xsd">
+    <service class="Magento\Customer\Api\CustomerRepositoryInterface" method="get" />
+
+</services>
diff --git a/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfigTest.php b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfigTest.php
new file mode 100644
index 00000000000..9292a9dea3b
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/Test/Unit/Model/ServiceConfigTest.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\WebapiAsync\Test\Unit\Model;
+
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Webapi\Model\Cache\Type\Webapi;
+use Magento\Webapi\Model\Config;
+use Magento\Webapi\Model\Config\Reader;
+
+class ServiceConfigTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var Webapi|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $webapiCacheMock;
+
+    /**
+     * @var Reader|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configReaderMock;
+
+    /**
+     * @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serializerMock;
+
+    protected function setUp()
+    {
+        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
+        $this->webapiCacheMock = $this->createMock(\Magento\Webapi\Model\Cache\Type\Webapi::class);
+        $this->configReaderMock = $this->createMock(\Magento\Webapi\Model\Config\Reader::class);
+        $this->serializerMock = $this->createMock(SerializerInterface::class);
+
+        $this->config = $objectManager->getObject(
+            Config::class,
+            [
+                'cache' => $this->webapiCacheMock,
+                'configReader' => $this->configReaderMock,
+                'serializer' => $this->serializerMock
+            ]
+        );
+    }
+
+    public function testGetServices()
+    {
+        $data = ['foo' => 'bar'];
+        $serializedData = 'serialized data';
+        $this->webapiCacheMock->expects($this->once())
+            ->method('load')
+            ->with(Config::CACHE_ID)
+            ->willReturn($serializedData);
+        $this->serializerMock->expects($this->once())
+            ->method('unserialize')
+            ->with($serializedData)
+            ->willReturn($data);
+        $this->config->getServices();
+        $this->assertEquals($data, $this->config->getServices());
+    }
+
+    public function testGetServicesNoCache()
+    {
+        $data = ['foo' => 'bar'];
+        $serializedData = 'serialized data';
+        $this->webapiCacheMock->expects($this->once())
+            ->method('load')
+            ->with(Config::CACHE_ID)
+            ->willReturn(false);
+        $this->serializerMock->expects($this->never())
+            ->method('unserialize');
+        $this->configReaderMock->expects($this->once())
+            ->method('read')
+            ->willReturn($data);
+        $this->serializerMock->expects($this->once())
+            ->method('serialize')
+            ->with($data)
+            ->willReturn($serializedData);
+        $this->webapiCacheMock->expects($this->once())
+            ->method('save')
+            ->with(
+                $serializedData,
+                Config::CACHE_ID
+            );
+
+        $this->config->getServices();
+        $this->assertEquals($data, $this->config->getServices());
+    }
+}
diff --git a/app/code/Magento/WebapiAsync/composer.json b/app/code/Magento/WebapiAsync/composer.json
new file mode 100644
index 00000000000..9ba7cb24a11
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/composer.json
@@ -0,0 +1,31 @@
+{
+    "name": "magento/module-webapi-async",
+    "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "~7.1.3||~7.2.0",
+        "magento/framework": "100.3.*",
+        "magento/module-webapi": "100.3.*",
+        "magento/module-asynchronous-operations": "100.3.*"
+    },
+    "suggest": {
+        "magento/module-user": "100.3.*",
+        "magento/module-customer": "100.3.*"
+    },
+    "type": "magento2-module",
+    "version": "100.3.0-dev",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\WebapiAsync\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/WebapiAsync/etc/di.xml b/app/code/Magento/WebapiAsync/etc/di.xml
new file mode 100755
index 00000000000..7d289283ee0
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/etc/di.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Webapi\Model\ServiceMetadata">
+        <plugin name="webapiServiceMetadataAsync" type="Magento\WebapiAsync\Plugin\ServiceMetadata" />
+    </type>
+</config>
diff --git a/app/code/Magento/WebapiAsync/etc/module.xml b/app/code/Magento/WebapiAsync/etc/module.xml
new file mode 100644
index 00000000000..abda4ff56ae
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/etc/module.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_WebapiAsync">
+        <sequence>
+            <module name="Magento_Webapi"/>
+            <module name="Magento_AsynchronousOperations"/>
+        </sequence>
+    </module>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/WebapiAsync/etc/queue_consumer.xml b/app/code/Magento/WebapiAsync/etc/queue_consumer.xml
new file mode 100644
index 00000000000..f8a1a18d754
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/etc/queue_consumer.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/consumer.xsd">
+    <consumer name="async.operations.all" queue="async.operations.all" connection="amqp"
+              consumerInstance="Magento\AsynchronousOperations\Model\MassConsumer"/>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/WebapiAsync/etc/queue_topology.xml b/app/code/Magento/WebapiAsync/etc/queue_topology.xml
new file mode 100644
index 00000000000..9e4ac909c22
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/etc/queue_topology.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/topology.xsd">
+    <exchange name="magento" type="topic" connection="amqp">
+        <binding id="async.operations.all" topic="async.#" destinationType="queue" destination="async.operations.all"/>
+    </exchange>
+</config>
diff --git a/app/code/Magento/WebapiAsync/etc/webapi_async.xsd b/app/code/Magento/WebapiAsync/etc/webapi_async.xsd
new file mode 100644
index 00000000000..468ebd96553
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/etc/webapi_async.xsd
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Structure description for webapi_async.xml configuration files.
+ *
+ * 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="services" type="servicesType"/>
+
+    <xs:complexType name="serviceType">
+        <xs:sequence>
+            <xs:element name="synchronousInvocationOnly" type="xs:boolean" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="class" type="xs:string" use="required"/>
+        <xs:attribute name="method" type="xs:string" use="required"/>
+    </xs:complexType>
+
+    <xs:complexType name="servicesType">
+        <xs:sequence>
+            <xs:element name="service" type="servicesType" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/app/code/Magento/WebapiAsync/etc/webapi_rest/di.xml b/app/code/Magento/WebapiAsync/etc/webapi_rest/di.xml
new file mode 100644
index 00000000000..9e7fd21a235
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/etc/webapi_rest/di.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+
+    <type name="Magento\Webapi\Controller\Rest\RequestProcessorPool">
+        <arguments>
+            <argument name="requestProcessors" xsi:type="array">
+                <item name="asyncSchema" xsi:type="object" sortOrder="60">Magento\WebapiAsync\Controller\Rest\AsynchronousSchemaRequestProcessor</item>
+                <item name="async" xsi:type="object" sortOrder="150">Magento\WebapiAsync\Controller\Rest\AsynchronousRequestProcessor</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
\ No newline at end of file
diff --git a/app/code/Magento/WebapiAsync/registration.php b/app/code/Magento/WebapiAsync/registration.php
new file mode 100644
index 00000000000..b09a533ab30
--- /dev/null
+++ b/app/code/Magento/WebapiAsync/registration.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+\Magento\Framework\Component\ComponentRegistrar::register(
+    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+    'Magento_WebapiAsync',
+    __DIR__
+);
diff --git a/app/code/Magento/Wishlist/Observer/AddToCart.php b/app/code/Magento/Wishlist/Observer/AddToCart.php
index c0461a94206..1ab24d87efb 100644
--- a/app/code/Magento/Wishlist/Observer/AddToCart.php
+++ b/app/code/Magento/Wishlist/Observer/AddToCart.php
@@ -76,7 +76,7 @@ public function execute(Observer $observer)
             $wishlistIds = [$singleWishlistId];
         }
 
-        if (count($wishlistIds) && $request->getParam('wishlist_next')) {
+        if (is_array($wishlistIds) && count($wishlistIds) && $request->getParam('wishlist_next')) {
             $wishlistId = array_shift($wishlistIds);
 
             if ($this->customerSession->isLoggedIn()) {
diff --git a/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/steps/_bulk-images.less b/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/steps/_bulk-images.less
index cf3bc385f84..b2dc94d9ffa 100644
--- a/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/steps/_bulk-images.less
+++ b/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/steps/_bulk-images.less
@@ -92,4 +92,13 @@
             text-align: left;
         }
     }
+
+    .button-assign-sources {
+        margin-left: 0;
+
+        .admin__field-control {
+            float: right;
+            display: inline-block;
+        }
+    }
 }
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_components.less b/app/design/adminhtml/Magento/backend/web/css/source/_components.less
index 3f9f0ed00c5..5eb044426b8 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/_components.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/_components.less
@@ -22,3 +22,4 @@
 @import 'components/_file-uploader.less';
 @import 'components/_image-uploader.less';
 @import 'components/_slider.less';
+@import 'components/_url_input.less';
\ No newline at end of file
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_url_input.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_url_input.less
new file mode 100644
index 00000000000..26d963b0201
--- /dev/null
+++ b/app/design/adminhtml/Magento/backend/web/css/source/components/_url_input.less
@@ -0,0 +1,32 @@
+// /**
+//  * Copyright © Magento, Inc. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Components -> Url Input
+//  _____________________________________________
+.url-input-container {
+
+    .url-input-select {
+        float: left;
+        max-width: 7.5em;
+        min-width: 7.5em;
+    }
+
+
+    .url-input-element-linked-element {
+        float: left;
+        margin-left: 1.5em;
+        width: calc(~'100% - 9em');
+    }
+
+    .url-input-setting {
+        clear: both;
+        display: block;
+        &:before {
+            content: "";
+            clear: both;
+        }
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
index e29efd13b16..59675de6987 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
@@ -279,7 +279,7 @@
     //  Hide group legend and show first field label instead
     legend {
         &.admin__field-label {
-            opacity: 0;
+            opacity: 1;
         }
     }
 
diff --git a/app/design/frontend/Magento/blank/etc/view.xml b/app/design/frontend/Magento/blank/etc/view.xml
index 8264e3111de..78fb54c0b54 100644
--- a/app/design/frontend/Magento/blank/etc/view.xml
+++ b/app/design/frontend/Magento/blank/etc/view.xml
@@ -260,7 +260,6 @@
     <exclude>
         <item type="file">Lib::jquery/jquery.min.js</item>
         <item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
-        <item type="file">Lib::jquery/jquery.ba-hashchange.min.js</item>
         <item type="file">Lib::jquery/jquery.details.js</item>
         <item type="file">Lib::jquery/jquery.details.min.js</item>
         <item type="file">Lib::jquery/jquery.hoverIntent.js</item>
diff --git a/app/design/frontend/Magento/luma/etc/view.xml b/app/design/frontend/Magento/luma/etc/view.xml
index 349224a3402..08e6883da99 100644
--- a/app/design/frontend/Magento/luma/etc/view.xml
+++ b/app/design/frontend/Magento/luma/etc/view.xml
@@ -270,7 +270,6 @@
     <exclude>
         <item type="file">Lib::jquery/jquery.min.js</item>
         <item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
-        <item type="file">Lib::jquery/jquery.ba-hashchange.min.js</item>
         <item type="file">Lib::jquery/jquery.details.js</item>
         <item type="file">Lib::jquery/jquery.details.min.js</item>
         <item type="file">Lib::jquery/jquery.hoverIntent.js</item>
diff --git a/app/design/frontend/Magento/rush/etc/view.xml b/app/design/frontend/Magento/rush/etc/view.xml
index 1f8b416e1af..cb963250c5e 100644
--- a/app/design/frontend/Magento/rush/etc/view.xml
+++ b/app/design/frontend/Magento/rush/etc/view.xml
@@ -261,7 +261,6 @@
     <exclude>
         <item type="file">Lib::jquery/jquery.min.js</item>
         <item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
-        <item type="file">Lib::jquery/jquery.ba-hashchange.min.js</item>
         <item type="file">Lib::jquery/jquery.details.js</item>
         <item type="file">Lib::jquery/jquery.details.min.js</item>
         <item type="file">Lib::jquery/jquery.hoverIntent.js</item>
diff --git a/app/etc/di.xml b/app/etc/di.xml
index e43a019697b..986652bc6ba 100755
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -176,6 +176,8 @@
     <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\Framework\MultiDimensionalIndexer\IndexTableSwitcherInterface" type="Magento\Framework\MultiDimensionalIndexer\IndexTableSwitcher" />
+    <preference for="Magento\Framework\MultiDimensionalIndexer\IndexNameResolverInterface" type="Magento\Framework\MultiDimensionalIndexer\IndexNameResolver" />
     <preference for="Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaReaderInterface" type="Magento\Framework\Setup\Declaration\Schema\Db\MySQL\DbSchemaReader" />
     <preference for="Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaWriterInterface" type="Magento\Framework\Setup\Declaration\Schema\Db\MySQL\DbSchemaWriter" />
     <preference for="Magento\Framework\Setup\Declaration\Schema\SchemaConfigInterface" type="Magento\Framework\Setup\Declaration\Schema\SchemaConfig" />
@@ -218,9 +220,14 @@
             <argument name="filesystem" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
         </arguments>
     </type>
+    <preference for="Magento\AsynchronousOperations\Model\ConfigInterface" type="Magento\WebapiAsync\Model\Config\Proxy" />
     <type name="Magento\Framework\Communication\Config\CompositeReader">
         <arguments>
             <argument name="readers" xsi:type="array">
+                <item name="asyncServiceReader" xsi:type="array">
+                    <item name="reader" xsi:type="object">Magento\WebapiAsync\Code\Generator\Config\RemoteServiceReader\Communication</item>
+                    <item name="sortOrder" xsi:type="string">0</item>
+                </item>
                 <item name="xmlReader" xsi:type="array">
                     <item name="reader" xsi:type="object">Magento\Framework\Communication\Config\Reader\XmlReader</item>
                     <item name="sortOrder" xsi:type="string">10</item>
@@ -1380,6 +1387,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\MultiDimensionalIndexer\IndexNameResolver">
+        <arguments>
+            <argument name="indexScopeResolver" xsi:type="object">Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver</argument>
+        </arguments>
+    </type>
     <type name="Magento\Framework\Setup\Declaration\Schema\Dto\ElementFactory">
         <arguments>
             <argument name="typeFactories" xsi:type="array">
@@ -1598,6 +1610,7 @@
     <type name="Magento\Framework\MessageQueue\Publisher\Config\CompositeReader">
         <arguments>
             <argument name="readers" xsi:type="array">
+                <item name="asyncServiceReader" xsi:type="object" sortOrder="0">Magento\WebapiAsync\Code\Generator\Config\RemoteServiceReader\Publisher</item>
                 <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>
diff --git a/composer.json b/composer.json
index eac773ffa5e..090a2938279 100644
--- a/composer.json
+++ b/composer.json
@@ -40,15 +40,16 @@
         "colinmollenhour/cache-backend-redis": "1.10.4",
         "colinmollenhour/credis": "1.8.2",
         "colinmollenhour/php-redis-session-abstract": "~1.3.8",
-        "composer/composer": "~1.6.0",
-        "magento/composer": "1.3.0.x-dev",
+        "composer/composer": "^1.6",
         "elasticsearch/elasticsearch": "~2.0|~5.1",
+        "magento/composer": "~1.3.0",
         "magento/magento-composer-installer": ">=0.1.11",
         "magento/zendframework1": "dev-master",
         "monolog/monolog": "^1.17",
         "oyejorge/less.php": "~1.7.0",
         "pelago/emogrifier": "^2.0.0",
-        "php-amqplib/php-amqplib": "2.5.*",
+        "php-amqplib/php-amqplib": "~2.7.0",
+        "phpseclib/mcrypt_compat": "1.0.4",
         "phpseclib/phpseclib": "2.0.*",
         "ramsey/uuid": "~3.7.3",
         "symfony/console": "~4.0.0",
@@ -83,8 +84,7 @@
         "zendframework/zend-text": "^2.6.0",
         "zendframework/zend-uri": "^2.5.1",
         "zendframework/zend-validator": "^2.6.0",
-        "zendframework/zend-view": "^2.8.1",
-        "phpseclib/mcrypt_compat": "1.0.4"
+        "zendframework/zend-view": "^2.8.1"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "~2.10.0",
@@ -211,6 +211,8 @@
         "magento/module-sitemap": "100.3.0-dev",
         "magento/module-store": "100.3.0-dev",
         "magento/module-swagger": "100.3.0-dev",
+        "magento/module-swagger-webapi": "100.3.0-dev",
+        "magento/module-swagger-webapi-async": "100.3.0-dev",
         "magento/module-swatches": "100.3.0-dev",
         "magento/module-swatches-layered-navigation": "100.3.0-dev",
         "magento/module-tax": "100.3.0-dev",
@@ -226,6 +228,7 @@
         "magento/module-vault": "100.3.0-dev",
         "magento/module-version": "100.3.0-dev",
         "magento/module-webapi": "100.3.0-dev",
+        "magento/module-webapi-async": "100.3.0-dev",
         "magento/module-webapi-security": "100.3.0-dev",
         "magento/module-weee": "100.3.0-dev",
         "magento/module-widget": "100.3.0-dev",
@@ -302,4 +305,4 @@
         }
     },
     "prefer-stable": true
-}
+}
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 90eb52e95fc..921e2999f67 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": "f5c0c61d6a0bce888692dd5824e6c53f",
+    "content-hash": "7f71731306499d04ec29d46ad9726304",
     "packages": [
         {
             "name": "braintree/braintree_php",
@@ -201,16 +201,16 @@
         },
         {
             "name": "composer/ca-bundle",
-            "version": "1.1.0",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "943b2c4fcad1ef178d16a713c2468bf7e579c288"
+                "reference": "d2c0a83b7533d6912e8d516756ebd34f893e9169"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/943b2c4fcad1ef178d16a713c2468bf7e579c288",
-                "reference": "943b2c4fcad1ef178d16a713c2468bf7e579c288",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/d2c0a83b7533d6912e8d516756ebd34f893e9169",
+                "reference": "d2c0a83b7533d6912e8d516756ebd34f893e9169",
                 "shasum": ""
             },
             "require": {
@@ -219,7 +219,7 @@
                 "php": "^5.3.2 || ^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
                 "psr/log": "^1.0",
                 "symfony/process": "^2.5 || ^3.0 || ^4.0"
             },
@@ -253,7 +253,7 @@
                 "ssl",
                 "tls"
             ],
-            "time": "2017-11-29T09:37:33+00:00"
+            "time": "2018-03-29T19:57:20+00:00"
         },
         {
             "name": "composer/composer",
@@ -710,20 +710,20 @@
         },
         {
             "name": "magento/composer",
-            "version": "1.3.0.x-dev",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/composer.git",
-                "reference": "21e4019f051513be041f5611fab717af63b5451e"
+                "reference": "38fdaa51967cd3dbed85cf695b6a70e3c2ff8a92"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/composer/zipball/21e4019f051513be041f5611fab717af63b5451e",
-                "reference": "21e4019f051513be041f5611fab717af63b5451e",
+                "url": "https://api.github.com/repos/magento/composer/zipball/38fdaa51967cd3dbed85cf695b6a70e3c2ff8a92",
+                "reference": "38fdaa51967cd3dbed85cf695b6a70e3c2ff8a92",
                 "shasum": ""
             },
             "require": {
-                "composer/composer": "~1.6.0",
+                "composer/composer": "^1.6",
                 "php": "~7.1.3|~7.2.0",
                 "symfony/console": "~4.0.0"
             },
@@ -742,7 +742,7 @@
                 "AFL-3.0"
             ],
             "description": "Magento composer library helps to instantiate Composer application and run composer commands.",
-            "time": "2018-02-23T15:57:04+00:00"
+            "time": "2018-03-26T16:19:52+00:00"
         },
         {
             "name": "magento/magento-composer-installer",
@@ -829,12 +829,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento-engcom/zf1-php-7.2-support.git",
-                "reference": "d99ca643e52e2465ef84abc61646159807a0de93"
+                "reference": "10d8c93d5fc04b5e7d93ff1f69c3d30a5f6865b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento-engcom/zf1-php-7.2-support/zipball/d99ca643e52e2465ef84abc61646159807a0de93",
-                "reference": "d99ca643e52e2465ef84abc61646159807a0de93",
+                "url": "https://api.github.com/repos/magento-engcom/zf1-php-7.2-support/zipball/10d8c93d5fc04b5e7d93ff1f69c3d30a5f6865b8",
+                "reference": "10d8c93d5fc04b5e7d93ff1f69c3d30a5f6865b8",
                 "shasum": ""
             },
             "archive": {
@@ -878,7 +878,7 @@
                 "source": "https://github.com/magento-engcom/zf1-php-7.2-support/tree/master",
                 "issues": "https://github.com/magento-engcom/zf1-php-7.2-support/issues"
             },
-            "time": "2018-03-20T01:20:27+00:00"
+            "time": "2018-03-30T18:59:41+00:00"
         },
         {
             "name": "monolog/monolog",
@@ -1139,16 +1139,16 @@
         },
         {
             "name": "php-amqplib/php-amqplib",
-            "version": "v2.5.2",
+            "version": "v2.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-amqplib/php-amqplib.git",
-                "reference": "eb8f94d97c8e79900accf77343dbd7eca7f58506"
+                "reference": "dfd3694a86f1a7394d3693485259d4074a6ec79b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/eb8f94d97c8e79900accf77343dbd7eca7f58506",
-                "reference": "eb8f94d97c8e79900accf77343dbd7eca7f58506",
+                "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/dfd3694a86f1a7394d3693485259d4074a6ec79b",
+                "reference": "dfd3694a86f1a7394d3693485259d4074a6ec79b",
                 "shasum": ""
             },
             "require": {
@@ -1156,8 +1156,14 @@
                 "ext-mbstring": "*",
                 "php": ">=5.3.0"
             },
+            "replace": {
+                "videlalvaro/php-amqplib": "self.version"
+            },
             "require-dev": {
-                "phpunit/phpunit": "3.7.*"
+                "phpdocumentor/phpdocumentor": "^2.9",
+                "phpunit/phpunit": "^4.8",
+                "scrutinizer/ocular": "^1.1",
+                "squizlabs/php_codesniffer": "^2.5"
             },
             "suggest": {
                 "ext-sockets": "Use AMQPSocketConnection"
@@ -1165,7 +1171,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.4-dev"
+                    "dev-master": "2.7-dev"
                 }
             },
             "autoload": {
@@ -1175,21 +1181,32 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "LGPL-2.1"
+                "LGPL-2.1-or-later"
             ],
             "authors": [
                 {
-                    "name": "Alvaro Videla"
+                    "name": "Alvaro Videla",
+                    "role": "Original Maintainer"
+                },
+                {
+                    "name": "John Kelly",
+                    "email": "johnmkelly86@gmail.com",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Raúl Araya",
+                    "email": "nubeiro@gmail.com",
+                    "role": "Maintainer"
                 }
             ],
-            "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/",
+            "description": "Formerly videlalvaro/php-amqplib.  This library is a pure PHP implementation of the AMQP protocol. It's been tested against RabbitMQ.",
+            "homepage": "https://github.com/php-amqplib/php-amqplib/",
             "keywords": [
                 "message",
                 "queue",
                 "rabbitmq"
             ],
-            "time": "2015-08-11T12:30:09+00:00"
+            "time": "2018-02-11T19:28:00+00:00"
         },
         {
             "name": "phpseclib/mcrypt_compat",
@@ -6566,7 +6583,6 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "magento/composer": 20,
         "magento/zendframework1": 20,
         "phpmd/phpmd": 0
     },
diff --git a/dev/tests/acceptance/tests/_data/magentoStage.jpg b/dev/tests/acceptance/tests/_data/magentoStage.jpg
new file mode 100644
index 00000000000..87c0f792c79
Binary files /dev/null and b/dev/tests/acceptance/tests/_data/magentoStage.jpg differ
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/MoveCategoryActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/MoveCategoryActionGroup.xml
new file mode 100644
index 00000000000..9a082efa75d
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/MoveCategoryActionGroup.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="MoveCategoryActionGroup">
+        <arguments>
+            <argument name="childCategory"/>
+            <argument name="parentCategory"/>
+        </arguments>
+        <click stepKey="expandAllCategoriesTree" selector="{{AdminCategorySidebarTreeSection.expandAll}}"/>
+        <waitForAjaxLoad stepKey="waitForCategoriesExpand"/>
+        <dragAndDrop selector1="{{AdminCategorySidebarTreeSection.categoryInTree('childCategory')}}" selector2="{{AdminCategorySidebarTreeSection.categoryInTree('parentCategory')}}" stepKey="moveCategory"/>
+        <waitForElementVisible selector="{{AdminCategoryModalSection.message}}" stepKey="waitForWarningMessageVisible"/>
+        <see selector="{{AdminCategoryModalSection.message}}" userInput="This operation can take a long time" stepKey="seeWarningMessage"/>
+        <click selector="{{AdminCategoryModalSection.ok}}" stepKey="clickOkButtonOnWarningPopup"/>
+        <waitForPageLoad stepKey="waitForCategoryPageReload"/>
+    </actionGroup>
+</actionGroups>
\ No newline at end of file
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
index af71e1520bf..3b04df7fdd1 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontCategoryActionGroup.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/StorefrontCategoryActionGroup.xml
@@ -12,7 +12,7 @@
     <actionGroup name="StorefrontCheckCategoryActionGroup">
         <arguments>
             <argument name="category"/>
-            <argument name="productCount"/>
+            <argument name="productCount" type="string"/>
         </arguments>
         <seeInCurrentUrl url="/{{category.custom_attributes[url_key]}}.html" stepKey="checkUrl"/>
         <seeInTitle userInput="{{category.name}}" stepKey="assertCategoryNameInTitle"/>
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 5de996809b7..a1147888a74 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
@@ -23,4 +23,17 @@
         <data key="is_active">true</data>
         <data key="include_in_menu">true</data>
     </entity>
+    <entity name="NewRootCategory" type="category">
+        <data key="name" unique="suffix">NewRootCategory</data>
+        <data key="name_lwr" unique="suffix">newrootcategory</data>
+        <data key="is_active">true</data>
+        <data key="include_in_menu">true</data>
+        <data key="parent_id">1</data>
+    </entity>
+    <entity name="SubCategoryWithParent" type="category">
+        <data key="name" unique="suffix">subCategory</data>
+        <data key="name_lwr" unique="suffix">subCategory</data>
+        <data key="is_active">true</data>
+        <var key="parent_id" entityType="category" entityKey="id" />
+    </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 231bcd5b427..9090c4669dc 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
@@ -133,4 +133,19 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
+    <entity name="productWithDescription" type="product">
+        <data key="sku" unique="suffix">testProductWithDescriptionSku</data>
+        <data key="type_id">simple</data>
+        <data key="attribute_set_id">4</data>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">testProductWithDescriptionName</data>
+        <data key="price">123.00</data>
+        <data key="urlKey" unique="suffix">testproductwithdescriptionurlkey</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>
+        <requiredEntity type="custom_attribute_array">ApiProductDescription</requiredEntity>
+        <requiredEntity type="custom_attribute_array">ApiProductShortDescription</requiredEntity>
+    </entity>
 </entities>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryModalSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryModalSection.xml
index 7435e759e29..d36256bf75d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryModalSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategoryModalSection.xml
@@ -12,6 +12,6 @@
         <element name="message" type="text" selector="aside.confirm div.modal-content"/>
         <element name="title" type="text" selector="aside.confirm .modal-header .modal-title"/>
         <element name="ok" type="button" selector="aside.confirm .modal-footer .action-primary"/>
-        <element name="cancel" type="button" selector="aside.confirm .modal-footer .action-dismiss"/>
+        <element name="cancel" type="button" selector="aside.confirm .modal-footer .action-secondary"/>
     </section>
 </sections>
\ No newline at end of file
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormActionSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormActionSection.xml
index 427c3523bb0..8c9789d3a6a 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormActionSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormActionSection.xml
@@ -11,5 +11,7 @@
     <section name="AdminProductFormActionSection">
         <element name="backButton" type="button" selector="#back" timeout="30"/>
         <element name="saveButton" type="button" selector="#save-button" timeout="30"/>
+        <element name="saveArrow" type="button" selector="button[data-ui-id='save-button-dropdown']" timeout="10"/>
+        <element name="saveAndClose" type="button" selector="span[title='Save &amp; Close']" timeout="30"/>
     </section>
 </sections>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminProductFormSection.xml
index 7483df63b60..f024e3e1ab2 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
@@ -12,17 +12,18 @@
         <element name="productName" type="input" selector=".admin__field[data-index=name] input"/>
         <element name="productSku" type="input" selector=".admin__field[data-index=sku] input"/>
         <element name="productPrice" type="input" selector=".admin__field[data-index=price] input"/>
+        <element name="productWeight" type="input" selector=".admin__field[data-index=weight] input"/>
         <element name="categoriesDropdown" type="multiselect" selector="div[data-index='category_ids']"/>
         <element name="productQuantity" type="input" selector=".admin__field[data-index=qty] input"/>
         <element name="productStockStatus" type="select" selector="select[name='product[quantity_and_stock_status][is_in_stock]']"/>
         <element name="productWeight" type="input" selector=".admin__field[data-index=weight] input"/>
-        <element name="contentTab" type="button" selector="//strong[@class='admin__collapsible-title']/span[text()='Content']"/>
+        <element name="contentTab" type="button" selector="//strong[contains(@class, 'admin__collapsible-title')]/span[text()='Content']"/>
         <element name="fieldError" type="text" selector="//input[@name='product[{{fieldName}}]']/following-sibling::label[@class='admin__field-error']" parameterized="true"/>
         <element name="priceFieldError" type="text" selector="//input[@name='product[price]']/parent::div/parent::div/label[@class='admin__field-error']"/>
         <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="attributeTab" type="button" selector="//strong[contains(@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"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/DeleteCategoriesTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/DeleteCategoriesTest.xml
new file mode 100644
index 00000000000..899dc18a6c7
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/DeleteCategoriesTest.xml
@@ -0,0 +1,163 @@
+<?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="DeleteCategoriesTest">
+        <annotations>
+            <features value="Delete categories"/>
+            <title value="Delete categories."/>
+            <description value="Delete Default Root Category and subcategories and vefify after products on storefront."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MAGETWO-46344"/>
+            <group value="testNotIsolated"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategoryC"/>
+            <createData entity="productWithDescription" stepKey="createProduct1">
+                <requiredEntity createDataKey="createCategoryC"/>
+            </createData>
+            <createData entity="SubCategoryWithParent" stepKey="createSubCategory">
+                <requiredEntity createDataKey="createCategoryC"/>
+            </createData>
+            <createData entity="productWithDescription" stepKey="createProduct2">
+                <requiredEntity createDataKey="createSubCategory"/>
+            </createData>
+            <createData entity="_defaultCategory" stepKey="createCategoryB"/>
+            <createData entity="productWithDescription" stepKey="createProduct3">
+                <requiredEntity createDataKey="createCategoryB"/>
+            </createData>
+            <createData entity="NewRootCategory" stepKey="createNewRootCategoryA"/>
+        </before>
+        <after>
+            <amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
+            <deleteData createDataKey="createProduct1" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="createProduct2" stepKey="deleteProduct2"/>
+            <deleteData createDataKey="createProduct3" stepKey="deleteProduct3"/>
+        </after>
+        <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPage1"/>
+        <waitForPageLoad time="30" stepKey="waitForPageCategoryLoadAfterNavigate"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree($$createNewRootCategoryA.name$$)}}" stepKey="openNewRootCategory"/>
+        <waitForPageLoad stepKey="waitForPageCategoryLoadAfterClickOnNewRootCategory"/>
+        <seeElement selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="assertDeleteButtonIsPresent"/>
+        <!--Move categories from Default Category to NewRootCategory. -->
+        <actionGroup ref="MoveCategoryActionGroup" stepKey="MoveCategoryBToNewRootCategory">
+            <argument name="childCategory" value="$$createCategoryC.name$$"/>
+            <argument name="parentCategory" value="$$createNewRootCategoryA.name$$"/>
+        </actionGroup>
+        <actionGroup ref="MoveCategoryActionGroup" stepKey="MoveCategoryCToNewRootCategory">
+            <argument name="childCategory" value="$$createCategoryB.name$$"/>
+            <argument name="parentCategory" value="$$createNewRootCategoryA.name$$"/>
+        </actionGroup>
+        <!-- Change root category for Main Website Store. -->
+        <amOnPage stepKey="s1" url="{{AdminSystemStorePage.url}}"/>
+        <waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad" />
+        <click stepKey="s2" selector="{{AdminStoresGridSection.resetButton}}"/>
+        <waitForPageLoad stepKey="waitForPageAdminStoresGridLoadAfterResetButton" time="10"/>
+        <fillField stepKey="s4" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="Main Website Store"/>
+        <click stepKey="s5" selector="{{AdminStoresGridSection.searchButton}}"/>
+        <waitForPageLoad stepKey="waitForPageAdminStoresGridLoadAfterSearchButton"/>
+        <click stepKey="s7" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" />
+        <waitForPageLoad stepKey="waitForPageAdminStoresGroupEditLoad" />
+        <selectOption selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="{{NewRootCategory.name}}" stepKey="setNewCategoryForStoreGroup"/>
+        <click selector="{{AdminNewStoreViewActionsSection.saveButton}}" stepKey="clickSaveStoreGroup"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModalSaveStoreGroup"/>
+        <see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptModal" />
+        <waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageAdminStoresGridReload"/>
+        <see userInput="You saved the store." stepKey="seeSavedMessage"/>
+
+        <!-- @TODO: Uncomment commented below code after MQE-903 is fixed -->
+        <!-- Perform cli reindex. -->
+        <!--<magentoCLI command="indexer:reindex" stepKey="magentoCli"/>-->
+
+        <!-- Delete Default Root Category. -->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPageAfterCLIReindexCommand"/>
+        <waitForPageLoad time="30" stepKey="waitForPageCategoryLoadAfterCLIReindexCommand"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree('Default Category')}}" stepKey="clickOnDefaultRootCategory"/>
+        <waitForPageLoad stepKey="waitForPageDefaultCategoryEditLoad" />
+        <seeElement selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="assertDeleteButtonIsPresent1"/>
+        <click selector="{{AdminCategoryMainActionsSection.DeleteButton}}" stepKey="DeleteDefaultRootCategory"/>
+        <waitForElementVisible selector="{{AdminCategoryModalSection.ok}}" stepKey="waitForModalDeleteDefaultRootCategory" />
+        <click selector="{{AdminCategoryModalSection.ok}}" stepKey="acceptModal1"/>
+        <waitForElementVisible selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="waitForPageReloadAfterDeleteDefaultCategory"/>
+        <!-- Verify categories 1 and 3 their products. -->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnHomePage"/>
+        <waitForPageLoad stepKey="homeWaitForPageLoad"/>
+
+        <!-- @TODO: Uncomment commented below code after MQE-903 is fixed -->
+        <!--<click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategoryC.name$$)}}" stepKey="browseClickCategoryC"/>-->
+        <!--<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="browseAssertCategoryC">-->
+            <!--<argument name="category" value="$$createCategoryC$$"/>-->
+            <!--<argument name="productCount" value="2"/>-->
+        <!--</actionGroup>-->
+        <!--<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct1">-->
+            <!--<argument name="product" value="$$createProduct1$$"/>-->
+        <!--</actionGroup>-->
+
+        <moveMouseOver selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategoryC.name$$)}}" stepKey="hoverCategory"/>
+        <waitForElementVisible selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createSubCategory.name$$)}}" stepKey="waitForSubcategory"/>
+        <click selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createSubCategory.name$$)}}" stepKey="browseClickSubCategory"/>
+        <actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="browseAssertSubcategory">
+            <argument name="category" value="$$createSubCategory$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct2">
+            <argument name="product" value="$$createProduct2$$"/>
+        </actionGroup>
+
+        <!-- @TODO: Uncomment commented below code after MQE-903 is fixed -->
+        <!--<actionGroup ref="StorefrontCheckCategoryActionGroup" stepKey="browseAssertCategoryB">-->
+            <!--<argument name="category" value="$$createCategoryB$$"/>-->
+            <!--<argument name="productCount" value="1"/>-->
+        <!--</actionGroup>-->
+        <!--<actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="browseAssertCategoryProduct3">-->
+            <!--<argument name="product" value="$$createProduct3$$"/>-->
+        <!--</actionGroup>-->
+
+        <!-- Delete Categories 1(with subcategory) and 3. -->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPageAfterStoreFrontCategoryAssertions"/>
+        <waitForPageLoad time="30" stepKey="waitForCategoryPageLoadAfterStoreFrontCategoryAssertions"/>
+        <actionGroup ref="DeleteCategory" stepKey="deleteCategoryC">
+            <argument name="categoryEntity" value="$$createCategoryC$$"/>
+        </actionGroup>
+        <actionGroup ref="DeleteCategory" stepKey="deleteCategoryB">
+            <argument name="categoryEntity" value="$$createCategoryB$$"/>
+        </actionGroup>
+        <!-- Verify categories 1 and 3 are absent -->
+        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnHomePage1"/>
+        <waitForPageLoad stepKey="waitHomePageLoadAfterDeletingCategories"/>
+        <dontSee selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategoryB.name$$)}}" stepKey="browseClickCategoryB"/>
+        <dontSee selector="{{StorefrontHeaderSection.NavigationCategoryByName($$createCategoryC.name$$)}}" stepKey="browseClickCategoryC"/>
+        <!-- Verify products 1-3 are available on storefront -->
+        <amOnPage url="{{StorefrontHomePage.url}}$$createProduct1.custom_attributes[url_key]$$.html" stepKey="amOnProduct1Page"/>
+        <waitForPageLoad stepKey="product1WaitForPageLoad"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="browseAssertProduct1Page">
+            <argument name="product" value="$$createProduct1$$"/>
+        </actionGroup>
+        <amOnPage url="{{StorefrontHomePage.url}}$$createProduct2.custom_attributes[url_key]$$.html" stepKey="amOnProduct2Page"/>
+        <waitForPageLoad stepKey="product2WaitForPageLoad"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="browseAssertProduct2Page">
+            <argument name="product" value="$$createProduct2$$"/>
+        </actionGroup>
+        <amOnPage url="{{StorefrontHomePage.url}}$$createProduct3.custom_attributes[url_key]$$.html" stepKey="amOnProduct3Page"/>
+        <waitForPageLoad stepKey="product3WaitForPageLoad"/>
+        <actionGroup ref="StorefrontCheckSimpleProduct" stepKey="browseAssertProduct3Page">
+            <argument name="product" value="$$createProduct3$$"/>
+        </actionGroup>
+        <!-- Rename New Root Category to Default category -->
+        <amOnPage url="{{AdminCategoryPage.url}}" stepKey="navigateToCategoryPageAfterStoreFrontProductsAssertions"/>
+        <waitForPageLoad time="30" stepKey="waitForCategoryPageLoadAfterStoreFrontProductsAssertions"/>
+        <click selector="{{AdminCategorySidebarTreeSection.categoryInTree('$$createNewRootCategoryA.name$$')}}" stepKey="clickOnNewRootCategoryA"/>
+        <waitForPageLoad stepKey="waitForPageNewRootCategoryALoad" />
+        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="Default Category" stepKey="enterCategoryNameAsDefaultCategory"/>
+        <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryDefaultCategory"/>
+        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessageAfterSaveDefaultCategory"/>
+    </test>
+</tests>
\ No newline at end of file
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
index 981737770f2..54782ca8ca5 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CGuestUserTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CGuestUserTest.xml
@@ -68,8 +68,7 @@
         <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"/>
+            <argument name="productCount" value="3"/>
         </actionGroup>
         <!-- Check simple product 1 in category -->
         <comment userInput="Check simple product 1 in category" stepKey="commentCheckSimpleProductInCategory" />
@@ -120,8 +119,7 @@
         <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"/>
+            <argument name="productCount" value="3"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="compareAssertSimpleProduct1">
             <argument name="product" value="$$createSimpleProduct1$$"/>
@@ -147,8 +145,7 @@
         <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"/>
+            <argument name="productCount" value="3"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="compareAssertSimpleProduct2">
             <argument name="product" value="$$createSimpleProduct2$$"/>
@@ -196,8 +193,7 @@
         <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"/>
+            <argument name="productCount" value="3"/>
         </actionGroup>
         <actionGroup ref="StorefrontClearCompareActionGroup" stepKey="compareClearCompare"/>
         <comment userInput="End of Comparing Products" stepKey="endOfComparingProducts" />
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
index a903290940c..9bd00ea3aef 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CLoggedInUserTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Test/EndToEndB2CLoggedInUserTest.xml
@@ -57,8 +57,7 @@
         <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"/>
+            <argument name="productCount" value="3"/>
         </actionGroup>
         <!-- Check simple product 1 in category -->
         <comment userInput="Check simple product 1 in category" stepKey="commentCheckSimpleProductInCategory" after="browseAssertCategory"/>
@@ -109,8 +108,7 @@
         <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"/>
+            <argument name="productCount" value="3"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="compareAssertSimpleProduct1" after="compareAssertCategory">
             <argument name="product" value="$$createSimpleProduct1$$"/>
@@ -136,8 +134,7 @@
         <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"/>
+            <argument name="productCount" value="3"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="compareAssertSimpleProduct2" after="compareAssertCategory1">
             <argument name="product" value="$$createSimpleProduct2$$"/>
@@ -183,8 +180,7 @@
         <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"/>
+            <argument name="productCount" value="3"/>
         </actionGroup>
         <actionGroup ref="StorefrontClearCompareActionGroup" stepKey="compareClearCompare" after="compareAssertCategory2"/>
         <comment userInput="End of Comparing Products" stepKey="endOfComparingProducts" after="compareClearCompare"/>
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
index d512aebb2c2..8bee75f53c6 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/EndToEndB2CGuestUserTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/EndToEndB2CGuestUserTest.xml
@@ -17,8 +17,7 @@
         <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"/>
+            <argument name="productCount" value="3"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="cartAssertSimpleProduct1" after="cartAssertCategory">
             <argument name="product" value="$$createSimpleProduct1$$"/>
@@ -46,8 +45,7 @@
         <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"/>
+            <argument name="productCount" value="3"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="cartAssertSimpleProduct2" after="cartAssertCategory1ForSimpleProduct2">
             <argument name="product" value="$$createSimpleProduct2$$"/>
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
index 1cd30954d7f..74f815181cf 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/EndToEndB2CLoggedInUserTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/EndToEndB2CLoggedInUserTest.xml
@@ -17,8 +17,7 @@
         <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"/>
+            <argument name="productCount" value="3"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="cartAssertSimpleProduct1" after="cartAssertCategory">
             <argument name="product" value="$$createSimpleProduct1$$"/>
@@ -46,8 +45,7 @@
         <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"/>
+            <argument name="productCount" value="3"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckCategorySimpleProduct" stepKey="cartAssertSimpleProduct2" after="cartAssertCategory1ForSimpleProduct2">
             <argument name="product" value="$$createSimpleProduct2$$"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/DeleteImageFromStorageActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/DeleteImageFromStorageActionGroup.xml
new file mode 100644
index 00000000000..c4af2bc8506
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/DeleteImageFromStorageActionGroup.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="DeleteImageFromStorageActionGroup">
+        <arguments>
+            <argument name="Image" defaultValue="" />
+        </arguments>
+        <click selector="//small[contains(text(),'{{Image.value}}')]" stepKey="selectImage" />
+        <see selector="{{MediaGallerySection.DeleteSelectedBtn}}" userInput="Delete Selected" stepKey="seeDeleteBtn"/>
+        <click selector="{{MediaGallerySection.DeleteSelectedBtn}}" stepKey="clickDeleteSelected" />
+        <waitForText userInput="OK" stepKey="waitForConfirm" />
+        <click selector="{{MediaGallerySection.confirmDelete}}" stepKey="confirmDelete" />
+        <waitForElementNotVisible selector="{{MediaGallerySection.image(ImageUpload.file)}}" stepKey="waitForImageDeleted" />
+        <dontSeeElement selector="{{MediaGallerySection.image(ImageUpload.file)}}" stepKey="dontSeeImage" />
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/NavigateToMediaFolderActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/NavigateToMediaFolderActionGroup.xml
new file mode 100644
index 00000000000..c886ab306cf
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/NavigateToMediaFolderActionGroup.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="NavigateToMediaFolderActionGroup">
+        <arguments>
+            <argument name="FolderName" type="string" defaultValue="" />
+        </arguments>
+        <conditionalClick selector="{{MediaGallerySection.StorageRootArrow}}" dependentSelector="{{MediaGallerySection.checkIfArrowExpand}}" stepKey="clickArrowIfClosed" visible="true"/>
+        <waitForText userInput="{{FolderName}}" stepKey="waitForNewFolder" />
+        <click userInput="{{FolderName}}" stepKey="clickOnCreatedFolder" />
+        <waitForLoadingMaskToDisappear stepKey="waitForLoading5" />
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/VerifyTinyMCEActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/VerifyTinyMCEActionGroup.xml
index f3c2f31270f..e3da3da1f2d 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/VerifyTinyMCEActionGroup.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/ActionGroup/VerifyTinyMCEActionGroup.xml
@@ -8,7 +8,7 @@
 <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="VerifyTinyMCEActionGroup">
-        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE" />
+        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE" time="30" />
         <seeElement selector="{{TinyMCESection.TinyMCE4}}" stepKey="seeTinyMCE4" />
         <seeElement selector="{{TinyMCESection.Style}}" stepKey="assertInfo2"/>
         <seeElement selector="{{TinyMCESection.Bold}}" stepKey="assertInfo3"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageActionsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageActionsSection.xml
index 41ae6b97a00..3ceef6d4227 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageActionsSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Section/CmsNewPagePageActionsSection.xml
@@ -18,6 +18,7 @@
         <element name="cmsPageTitle" type="text" selector=".page-header .page-title"/>
         <element name="pageTitle" type="input" selector="//*[@name='title']"/>
         <element name="showHideEditor" type="button" selector="//*[@id='togglecms_page_form_content']"/>
+        <element name="contentSectionName" type="input" selector="//div[@class='fieldset-wrapper-title']//span[.='Content']"/>
         <element name="content" type="input" selector="//textarea[@name='content']"/>
         <element name="spinner" type="input" selector='//div[@data-component="cms_page_form.cms_page_form"]' />
         <element name="saveAndClose" type="button" selector="#save_and_close" timeout="10"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminCreateCmsBlockTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminCreateCmsBlockTest.xml
index 540f1da21d8..77965cfedfd 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminCreateCmsBlockTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminCreateCmsBlockTest.xml
@@ -20,6 +20,7 @@
         </annotations>
         <before>
             <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
         </before>
         <after>
             <actionGroup ref="logout" stepKey="logout"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminCreateCmsPageTest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminCreateCmsPageTest.xml
index 7e168f9d67c..3bdd57ef2b9 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminCreateCmsPageTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Cms/Test/AdminCreateCmsPageTest.xml
@@ -90,6 +90,7 @@
         </annotations>
         <before>
             <actionGroup ref="LoginActionGroup" stepKey="loginGetFromGeneralFile"/>
+            <actionGroup ref="DisabledWYSIWYG" stepKey="disableWYSIWYG"/>
         </before>
         <after>
             <actionGroup ref="logout" stepKey="logout"/>
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
index d3791f4d526..d98ab9d5089 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CGuestUserTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CGuestUserTest.xml
@@ -112,8 +112,7 @@
         <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"/>
+            <argument name="productCount" value="3"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="cartAssertConfigProduct" after="cartAssertCategory1ForConfigurableProduct">
             <argument name="product" value="$$createConfigProduct$$"/>
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
index b1b73d40da1..a75aa8c27f0 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CLoggedInUserTest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/ConfigurableProduct/Test/EndToEndB2CLoggedInUserTest.xml
@@ -112,8 +112,7 @@
         <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"/>
+            <argument name="productCount" value="3"/>
         </actionGroup>
         <actionGroup ref="StorefrontCheckCategoryConfigurableProduct" stepKey="cartAssertConfigProduct" after="cartAssertCategory1ForConfigurableProduct">
             <argument name="product" value="$$createConfigProduct$$"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterCest.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterCest.xml
index d60f19d2f8d..7d78b6f25ae 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterCest.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Newsletter/Test/VerifyTinyMCEv4IsNativeWYSIWYGOnNewsletterCest.xml
@@ -28,7 +28,6 @@
         <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" />
-        <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE" />
         <actionGroup ref="VerifyTinyMCEActionGroup" stepKey="verifyTinyMCE4"/>
         <actionGroup ref="VerifyMagentoEntityActionGroup" stepKey="verifyMagentoEntities"/>
         <executeJS function="tinyMCE.get('text').setContent('Hello World From Newsletter Template!');" stepKey="executeJSFillContent"/>
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
index 6c9ee30a970..c3611eae11f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridFilterActionGroup.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridFilterActionGroup.xml
@@ -13,7 +13,10 @@
         <arguments>
             <argument name="keyword"/>
         </arguments>
+
         <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <waitForPageLoad stepKey="waitForPageLoad" time="5"/>
+
         <fillField selector="{{AdminDataGridHeaderSection.search}}" userInput="{{keyword}}" stepKey="fillKeywordSearchField"/>
         <click selector="{{AdminDataGridHeaderSection.submitSearch}}" stepKey="clickKeywordSearch"/>
     </actionGroup>
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
index e5c81ba34be..ee981e06f49 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridPaginationActionGroup.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminDataGridPaginationActionGroup.xml
@@ -8,7 +8,6 @@
 
 <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"/>
@@ -28,5 +27,4 @@
         <click selector="{{AdminDataGridPaginationSection.perPageApplyInput}}" stepKey="applyCustomPerPage"/>
         <waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
     </actionGroup>
-
 </actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminGridFilterSearchResultsActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminGridFilterSearchResultsActionGroup.xml
new file mode 100644
index 00000000000..459ad5070da
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminGridFilterSearchResultsActionGroup.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="AdminGridFilterSearchResultsByInput">
+        <arguments>
+            <argument name="selector"/>
+            <argument name="value"/>
+        </arguments>
+
+        <conditionalClick selector="{{AdminGridFilterControls.clearAll}}" dependentSelector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .admin__data-grid-filters-current._show" visible="true" stepKey="clearTheFiltersIfPresent"/>
+        <waitForPageLoad stepKey="waitForPageLoad" time="5"/>
+
+        <click selector="{{AdminGridFilterControls.filters}}" stepKey="clickOnFilters1"/>
+        <fillField userInput="{{value}}" selector="{{selector}}" stepKey="fillCodeField2"/>
+        <click selector="{{AdminGridFilterControls.applyFilters}}" stepKey="clickOnApplyFilters1"/>
+    </actionGroup>
+</actionGroups>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminSaveAndCloseActionGroup.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminSaveAndCloseActionGroup.xml
new file mode 100644
index 00000000000..b8c36ba0b48
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/ActionGroup/AdminSaveAndCloseActionGroup.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminFormSaveAndClose">
+        <click selector="{{AdminProductFormActionSection.saveArrow}}" stepKey="openSaveDropDown"/>
+        <click selector="{{AdminProductFormActionSection.saveAndClose}}" stepKey="clickOnSaveAndClose"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="assertSaveMessageSuccess"/>
+    </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
index c383a05fd16..067756c4d4f 100644
--- a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminDataGridHeaderSection.xml
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminDataGridHeaderSection.xml
@@ -10,7 +10,7 @@
           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="search" type="input" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] input[placeholder='Search by keyword']"/>
         <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"/>
diff --git a/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminGridControlsSection.xml b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminGridControlsSection.xml
new file mode 100644
index 00000000000..71f8682e55b
--- /dev/null
+++ b/dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Ui/Section/AdminGridControlsSection.xml
@@ -0,0 +1,61 @@
+<?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">
+    <!-- TODO: Search, Notifications, Admin Menu -->
+    <section name="AdminGridMainControls">
+        <element name="add" type="button" selector="#add" timeout="30"/>
+        <element name="back" type="button" selector="#back" timeout="30"/>
+        <element name="reset" type="button" selector="#reset" timeout="30"/>
+        <element name="save" type="button" selector="#save-button" timeout="30"/>
+        <element name="saveAndContinue" type="button" selector="#save-button" timeout="30"/>
+        <element name="saveArrow" type="button" selector="button[data-ui-id='save-button-dropdown']" timeout="5"/>
+        <element name="saveAndClose" type="button" selector="span[title='Save &amp; Close']" timeout="30"/>
+        <element name="saveAndNew" type="button" selector="span[title='Save &amp; New']" timeout="30"/>
+    </section>
+    <section name="AdminGridSearchBox">
+        <element name="searchByKeyword" type="input" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] input[placeholder='Search by keyword']"/>
+        <element name="search" type="button" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] input[placeholder='Search by keyword'] + .action-submit" timeout="30"/>
+    </section>
+    <section name="AdminGridFilterControls">
+        <element name="filters" type="button" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] button[data-action='grid-filter-expand']" timeout="5"/>
+        <element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
+        <element name="cancel" type="button" selector="button[data-action='grid-filter-cancel']" timeout="30"/>
+        <element name="clearAll" type="button" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] button[data-action='grid-filter-reset']" timeout="5"/>
+    </section>
+    <!-- TODO: "Default View" drop down menu -->
+    <section name="AdminGridColumnsControls">
+        <element name="columns" type="button" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .admin__data-grid-action-columns"/>
+
+        <element name="columnName" type="button" selector="//label[contains(text(), '{{var1}}')]" parameterized="true" timeout="1"/>
+
+        <element name="reset" type="button" selector="//div[@class='admin__action-dropdown-menu-footer']/div/button[contains(text(), 'Reset')]" timeout="5"/>
+        <element name="cancel" type="button" selector="//div[@class='admin__action-dropdown-menu-footer']/div/button[contains(text(), 'Cancel')]" timeout="5"/>
+    </section>
+    <section name="AdminGridActionsMenu">
+        <element name="dropDown" type="select" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .action-select" timeout="30"/>
+    </section>
+    <section name="AdminGridRowsPerPage">
+        <element name="count" type="select" selector=".admin__data-grid-header[data-bind='afterRender: \$data.setToolbarNode'] .selectmenu-value input" timeout="30"/>
+    </section>
+    <!-- TODO: Pagination controls -->
+    <section name="AdminGridHeaders">
+        <element name="title" type="text" selector=".page-title-wrapper h1"/>
+        <element name="headerByName" type="text" selector="//span[@class='data-grid-cell-content' and contains(text(), '{{var1}}')]/parent::*" parameterized="true"/>
+    </section>
+    <section name="AdminGridRow">
+        <element name="rowOne" type="text" selector="tr[data-repeat-index='0']"/>
+        <element name="rowByIndex" type="text" selector="tr[data-repeat-index='{{var1}}']" parameterized="true"/>
+
+        <element name="editByValue" type="button" selector="//a[ancestor::tr[contains(., '{{var1}}')]]" parameterized="true"/>
+
+        <element name="checkboxByValue" type="checkbox" selector="//input[ancestor::tr[contains(., '{{var1}}')]]" parameterized="true"/>
+        <element name="checkboxByIndex" type="checkbox" selector=".data-row[data-repeat-index='{{var1}}'] .admin__control-checkbox" parameterized="true"/>
+    </section>
+</sections>
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiDataFixture.php b/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiDataFixture.php
index cff7bd4b221..bd83cdcaf3f 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiDataFixture.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/Annotation/ApiDataFixture.php
@@ -139,7 +139,8 @@ protected function _applyFixtures(array $fixtures)
      */
     protected function _revertFixtures()
     {
-        foreach ($this->_appliedFixtures as $fixture) {
+        $appliedFixtures = array_reverse($this->_appliedFixtures);
+        foreach ($appliedFixtures as $fixture) {
             if (is_callable($fixture)) {
                 $fixture[1] .= 'Rollback';
                 if (is_callable($fixture)) {
diff --git a/dev/tests/api-functional/framework/bootstrap.php b/dev/tests/api-functional/framework/bootstrap.php
index 942582392e8..01580bc268d 100644
--- a/dev/tests/api-functional/framework/bootstrap.php
+++ b/dev/tests/api-functional/framework/bootstrap.php
@@ -14,6 +14,14 @@
 $integrationTestsDir = realpath("{$testsBaseDir}/../integration");
 $fixtureBaseDir = $integrationTestsDir . '/testsuite';
 
+if (!defined('TESTS_TEMP_DIR')) {
+    define('TESTS_TEMP_DIR', $testsBaseDir . '/tmp');
+}
+
+if (!defined('INTEGRATION_TESTS_DIR')) {
+    define('INTEGRATION_TESTS_DIR', $integrationTestsDir);
+}
+
 try {
     setCustomErrorHandler();
 
@@ -36,7 +44,7 @@
     }
 
     $testFrameworkDir = __DIR__;
-    require_once __DIR__ . '/../../integration/framework/deployTestModules.php';
+    require_once INTEGRATION_TESTS_DIR . '/framework/deployTestModules.php';
 
     $installConfigFile = $settings->getAsConfigFile('TESTS_INSTALL_CONFIG_FILE');
     if (!file_exists($installConfigFile)) {
diff --git a/dev/tests/api-functional/phpunit_rest.xml.dist b/dev/tests/api-functional/phpunit_rest.xml.dist
index ae73039670a..a2bc077328e 100644
--- a/dev/tests/api-functional/phpunit_rest.xml.dist
+++ b/dev/tests/api-functional/phpunit_rest.xml.dist
@@ -19,6 +19,7 @@
         <testsuite name="Magento REST web API functional tests">
             <directory suffix="Test.php">testsuite</directory>
             <exclude>testsuite/Magento/GraphQl</exclude>
+            <directory suffix="Test.php">../../../app/code/*/*/Test/Api</directory>
         </testsuite>
     </testsuites>
 
diff --git a/dev/tests/api-functional/phpunit_soap.xml.dist b/dev/tests/api-functional/phpunit_soap.xml.dist
index ab3571359bc..cc0d5555383 100644
--- a/dev/tests/api-functional/phpunit_soap.xml.dist
+++ b/dev/tests/api-functional/phpunit_soap.xml.dist
@@ -19,6 +19,7 @@
         <testsuite name="Magento SOAP web API functional tests">
             <directory suffix="Test.php">testsuite</directory>
             <!-- <exclude>testsuite/Magento/GraphQl</exclude> -->
+            <directory suffix="Test.php">../../../app/code/*/*/Test/Api</directory>
         </testsuite>
     </testsuites>
 
diff --git a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/OptionRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/OptionRepositoryTest.php
index 9c1caefd174..43d5a5b63b8 100644
--- a/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/OptionRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/ConfigurableProduct/Api/OptionRepositoryTest.php
@@ -7,6 +7,9 @@
 
 namespace Magento\ConfigurableProduct\Api;
 
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Eav\Api\AttributeRepositoryInterface;
+
 class OptionRepositoryTest extends \Magento\TestFramework\TestCase\WebapiAbstract
 {
     const SERVICE_NAME = 'configurableProductOptionRepositoryV1';
@@ -138,6 +141,12 @@ public function testDelete()
      */
     public function testAdd()
     {
+        /** @var AttributeRepositoryInterface $attributeRepository */
+        $attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepositoryInterface::class);
+
+        /** @var \Magento\Eav\Api\Data\AttributeInterface $attribute */
+        $attribute = $attributeRepository->get('catalog_product', 'test_configurable');
+
         $productSku = 'simple';
         $serviceInfo = [
             'rest' => [
@@ -151,7 +160,7 @@ public function testAdd()
             ]
         ];
         $option = [
-            'attribute_id' => 'test_configurable',
+            'attribute_id' => $attribute->getAttributeId(),
             'label' => 'Test',
             'values' => [
                 [
diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/JsonGenerationFromDataObjectTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/JsonGenerationFromDataObjectTest.php
index 98d1c059caa..99e1152747b 100644
--- a/dev/tests/api-functional/testsuite/Magento/Webapi/JsonGenerationFromDataObjectTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/JsonGenerationFromDataObjectTest.php
@@ -78,7 +78,7 @@ public function testSingleServiceRetrieval()
 
     /**
      * @expectedException \Exception
-     * @expectedExceptionMessage Request does not match any route.
+     * @expectedExceptionMessage Specified request cannot be processed.
      */
     public function testInvalidRestUrlNoServices()
     {
diff --git a/dev/tests/api-functional/testsuite/Magento/WebapiAsync/Model/BulkScheduleTest.php b/dev/tests/api-functional/testsuite/Magento/WebapiAsync/Model/BulkScheduleTest.php
new file mode 100644
index 00000000000..d179b9793f6
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/WebapiAsync/Model/BulkScheduleTest.php
@@ -0,0 +1,284 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\WebapiAsync\Model;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\TestFramework\MessageQueue\PreconditionFailedException;
+use Magento\TestFramework\MessageQueue\PublisherConsumerController;
+use Magento\TestFramework\MessageQueue\EnvironmentPreconditionException;
+use Magento\TestFramework\TestCase\WebapiAbstract;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Framework\Phrase;
+use Magento\Framework\Registry;
+use Magento\Framework\Webapi\Exception;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+
+/**
+ * Check async request for product creation service, scheduling bulk to rabbitmq
+ * running consumers and check async.opearion.add consumer
+ * check if product was created by async requests
+ *
+ * @magentoAppIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class BulkScheduleTest extends WebapiAbstract
+{
+    const SERVICE_NAME = 'catalogProductRepositoryV1';
+    const SERVICE_VERSION = 'V1';
+    const REST_RESOURCE_PATH = '/V1/products';
+    const ASYNC_RESOURCE_PATH = '/async/V1/products';
+    const ASYNC_CONSUMER_NAME = 'async.operations.all';
+
+    const KEY_TIER_PRICES = 'tier_prices';
+    const KEY_SPECIAL_PRICE = 'special_price';
+    const KEY_CATEGORY_LINKS = 'category_links';
+
+    const BULK_UUID_KEY = 'bulk_uuid';
+
+    protected $consumers = [
+        self::ASYNC_CONSUMER_NAME
+    ];
+
+    /**
+     * @var string[]
+     */
+    private $skus = [];
+
+    /**
+     * @var PublisherConsumerController
+     */
+    private $publisherConsumerController;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Registry
+     */
+    private $registry;
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->logFilePath = TESTS_TEMP_DIR . "/MessageQueueTestLog.txt";
+        $this->registry = $this->objectManager->get(Registry::class);
+
+        $params = array_merge_recursive(
+            \Magento\TestFramework\Helper\Bootstrap::getInstance()->getAppInitParams(),
+            ['MAGE_DIRS'=> ['cache' => ['path' => TESTS_TEMP_DIR . '/cache']]]
+        );
+
+        /** @var PublisherConsumerController publisherConsumerController */
+        $this->publisherConsumerController = $this->objectManager->create(PublisherConsumerController::class, [
+            'consumers' => $this->consumers,
+            'logFilePath' => $this->logFilePath,
+            'appInitParams' => $params
+        ]);
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+
+        try {
+            $this->publisherConsumerController->initialize();
+        } catch (EnvironmentPreconditionException $e) {
+            $this->markTestSkipped($e->getMessage());
+        } catch (PreconditionFailedException $e) {
+            $this->fail(
+                $e->getMessage()
+            );
+        }
+
+        parent::setUp();
+    }
+
+    /**
+     * @dataProvider productCreationProvider
+     */
+    public function testAsyncScheduleBulk($product)
+    {
+        $this->_markTestAsRestOnly();
+        $this->skus[] = $product['product'][ProductInterface::SKU];
+        $this->clearProducts();
+
+        $response = $this->saveProductAsync($product);
+        $this->assertArrayHasKey(self::BULK_UUID_KEY, $response);
+        $this->assertNotNull($response[self::BULK_UUID_KEY]);
+
+        $this->assertCount(1, $response['request_items']);
+        $this->assertEquals('accepted', $response['request_items'][0]['status']);
+        $this->assertFalse($response['errors']);
+
+        //assert one products is created
+        try {
+            $this->publisherConsumerController->waitForAsynchronousResult(
+                [$this, 'assertProductCreation'],
+                [$product]
+            );
+        } catch (PreconditionFailedException $e) {
+            $this->fail("Not all products were created");
+        }
+    }
+
+    public function tearDown()
+    {
+        $this->clearProducts();
+        $this->publisherConsumerController->stopConsumers();
+        parent::tearDown();
+    }
+
+    private function clearProducts()
+    {
+        $size = $this->objectManager->create(Collection::class)
+            ->addAttributeToFilter('sku', ['in' => $this->skus])
+            ->load()
+            ->getSize();
+
+        if ($size == 0) {
+            return;
+        }
+
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', true);
+        try {
+            foreach ($this->skus as $sku) {
+                $this->productRepository->deleteById($sku);
+            }
+        } catch (\Exception $e) {
+            throw $e;
+            //nothing to delete
+        }
+        $this->registry->unregister('isSecureArea');
+
+        $size = $this->objectManager->create(Collection::class)
+            ->addAttributeToFilter('sku', ['in' => $this->skus])
+            ->load()
+            ->getSize();
+
+        if ($size > 0) {
+            throw new Exception(new Phrase("Collection size after clearing the products: %size", ['size' => $size]));
+        }
+    }
+
+    /**
+     * @param string $sku
+     * @param string|null $storeCode
+     * @return array|bool|float|int|string
+     * @dataProvider productGetDataProvider
+     * @expectedException \Exception
+     * @expectedExceptionMessage Specified request cannot be processed.
+     */
+    public function testGetProductAsync($sku, $storeCode = null)
+    {
+        $this->_markTestAsRestOnly();
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::ASYNC_RESOURCE_PATH . '/' . $sku,
+                'httpMethod'   => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+            ],
+        ];
+
+        $response = $this->_webApiCall($serviceInfo, [ProductInterface::SKU => $sku], null, $storeCode);
+
+        return $response;
+    }
+
+    /**
+     * @return array
+     */
+    public function productCreationProvider()
+    {
+        $productBuilder = function ($data) {
+            return array_replace_recursive(
+                $this->getSimpleProductData(),
+                $data
+            );
+        };
+
+        return [
+            [
+                ['product' =>
+                    $productBuilder([
+                        ProductInterface::TYPE_ID => 'simple',
+                        ProductInterface::SKU => 'psku-test-1'
+                    ])
+                ]
+            ],
+            [['product' => $productBuilder([
+                ProductInterface::TYPE_ID => 'virtual',
+                ProductInterface::SKU => 'psku-test-2'])
+            ]]
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function productGetDataProvider()
+    {
+        return [
+            ['psku-test-1', null]
+        ];
+    }
+
+    /**
+     * Get Simple Product Data
+     *
+     * @param array $productData
+     * @return array
+     */
+    private function getSimpleProductData($productData = [])
+    {
+        return [
+            ProductInterface::SKU              => isset($productData[ProductInterface::SKU])
+                ? $productData[ProductInterface::SKU] : uniqid('sku-', true),
+            ProductInterface::NAME             => isset($productData[ProductInterface::NAME])
+                ? $productData[ProductInterface::NAME] : uniqid('sku-', true),
+            ProductInterface::VISIBILITY       => 4,
+            ProductInterface::TYPE_ID          => 'simple',
+            ProductInterface::PRICE            => 3.62,
+            ProductInterface::STATUS           => 1,
+            ProductInterface::TYPE_ID          => 'simple',
+            ProductInterface::ATTRIBUTE_SET_ID => 4,
+            'custom_attributes'                => [
+                ['attribute_code' => 'cost', 'value' => ''],
+                ['attribute_code' => 'description', 'value' => 'Description'],
+            ],
+        ];
+    }
+
+    /**
+     * @param $requestData
+     * @param string|null $storeCode
+     * @return mixed
+     */
+    private function saveProductAsync($requestData, $storeCode = null)
+    {
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::ASYNC_RESOURCE_PATH,
+                'httpMethod'   => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
+            ],
+        ];
+
+        return $this->_webApiCall($serviceInfo, $requestData, null, $storeCode);
+    }
+
+    public function assertProductCreation()
+    {
+        $collection = $this->objectManager->create(Collection::class)
+            ->addAttributeToFilter('sku', ['in' => $this->skus])
+            ->load();
+        $size = $collection->getSize();
+        return $size == count($this->skus);
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Section/ProductGrid.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Section/ProductGrid.php
index 19033094c1f..6dd6c6c863d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Section/ProductGrid.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Category/Edit/Section/ProductGrid.php
@@ -29,6 +29,14 @@ class ProductGrid extends Grid
         'name' => [
             'selector' => '#catalog_category_products_filter_name',
         ],
+        'visibility' => [
+            'selector' => '#catalog_category_products_filter_visibility',
+            'input' => 'select',
+        ],
+        'status' => [
+            'selector' => '#catalog_category_products_filter_status',
+            'input' => 'select',
+        ],
     ];
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Options.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Options.php
index ce27efe8d50..2ac4fb81ae6 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Options.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/Options.php
@@ -75,6 +75,13 @@ class Options extends Section
      */
     protected $staticDataRow = '[data-index="container_type_static"] div:nth-child(%d)';
 
+    /**
+     * Locator for file_extension field.
+     *
+     * @var string
+     */
+    private $hintMessage = "div[data-index='file_extension'] div[id^='notice']";
+
     /**
      * Sort rows data.
      *
@@ -386,4 +393,14 @@ public function getValuesDataForOption(array $options, string $optionType, strin
 
         return $formDataItem;
     }
+
+    /**
+     * Returns notice-message elements for 'file_extension' fields.
+     *
+     * @return ElementInterface[]
+     */
+    public function getFileOptionElements()
+    {
+        return $this->_rootElement->getElements($this->hintMessage);
+    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryProductsGridFilter.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryProductsGridFilter.php
new file mode 100644
index 00000000000..26e6805d014
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCategoryProductsGridFilter.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Magento\Catalog\Test\Fixture\Category;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryEdit;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogCategoryIndex;
+use Magento\Mtf\Constraint\AbstractConstraint;
+
+/**
+ * Assert that category products grid filter works correctly.
+ */
+class AssertCategoryProductsGridFilter extends AbstractConstraint
+{
+    /**
+     * Grid columns for tests
+     *
+     * @var array
+     */
+    private $testFilterColumns = [
+        'visibility',
+    ];
+    
+    /**
+     * Assert that category products grid filter works correctly.
+     *
+     * @param CatalogCategoryIndex $catalogCategoryIndex
+     * @param CatalogCategoryEdit $catalogCategoryEdit
+     * @param Category $category
+     * @return void
+     */
+    public function processAssert(
+        CatalogCategoryIndex $catalogCategoryIndex,
+        CatalogCategoryEdit $catalogCategoryEdit,
+        Category $category
+    ) {
+        $catalogCategoryIndex->getTreeCategories()->selectCategory($category, true);
+        $categoryProducts = $category->getDataFieldConfig('category_products')['source']->getProducts();
+        $catalogCategoryEdit->getEditForm()->openSection('category_products');
+        
+        foreach ($this->testFilterColumns as $field) {
+            $this->testGridFilter($categoryProducts, $catalogCategoryEdit, $field);
+        }
+    }
+
+    /**
+     * @param array $categoryProducts
+     * @param CatalogCategoryEdit $catalogCategoryEdit
+     * @param string $filterField
+     * @return void
+     */
+    private function testGridFilter(array $categoryProducts, CatalogCategoryEdit $catalogCategoryEdit, $filterField)
+    {
+        $expectedProducts = [];
+        foreach ($categoryProducts as $product) {
+            $expectedProducts[$product->getData('name')] = [
+                'filter' => $filterField,
+                'value' => $product->getData($filterField)
+            ];
+        }
+
+        $actualProducts = [];
+        /** @var \Magento\Catalog\Test\Block\Adminhtml\Category\Edit\CategoryForm $productsFieldset */
+        $productsFieldset = $catalogCategoryEdit->getEditForm()->getSection('category_products');
+        $gridRows = $productsFieldset->getProductGrid()->getRowsData(['name', $filterField]);
+        foreach ($gridRows as $row) {
+            $actualProducts[$row['name']] = [
+                'filter' => $filterField,
+                'value' => $row[$filterField]
+            ];
+        }
+
+        \PHPUnit\Framework\Assert::assertEquals(
+            $expectedProducts,
+            $actualProducts,
+            "Category products grid filter '$filterField' does not work correctly"
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString() : string
+    {
+        return 'Category products grid filter works correctly';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCustomOptions.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCustomOptions.php
new file mode 100644
index 00000000000..44190924c06
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertCustomOptions.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
+use Magento\Mtf\Fixture\FixtureInterface;
+
+/**
+ * Asserts what custom option values are same as expected.
+ */
+class AssertCustomOptions extends AssertProductForm
+{
+    /**
+     * Assert form data equals fixture data.
+     *
+     * @param FixtureInterface $product
+     * @param CatalogProductIndex $productGrid
+     * @param CatalogProductEdit $productPage
+     * @return void
+     */
+    public function processAssert(
+        FixtureInterface $product,
+        CatalogProductIndex $productGrid,
+        CatalogProductEdit $productPage
+    ) {
+        $expectedCustomOptions = $this->arguments['expectedCustomOptions'];
+        $filter = ['sku' => $product->getSku()];
+        $productGrid->open();
+        $productGrid->getProductGrid()->searchAndOpen($filter);
+        $productData = [];
+        if ($product->hasData('custom_options')) {
+            $productData = $this->addExpectedOptionValues($product, $expectedCustomOptions);
+        }
+        $fixtureData = $this->prepareFixtureData($productData, $this->sortFields);
+        $formData = $this->prepareFormData($productPage->getProductForm()->getData($product), $this->sortFields);
+        $errors = $this->verifyData($fixtureData, $formData);
+
+        \PHPUnit\Framework\Assert::assertEmpty($errors, $errors);
+    }
+
+    /**
+     * Adds expected value of Custom Options.
+     *
+     * @param FixtureInterface $product
+     * @param array $expectedCustomOptions
+     * @return array
+     */
+    private function addExpectedOptionValues(FixtureInterface $product, array $expectedCustomOptions)
+    {
+        /** @var array $customOptionsSource */
+        $customOptionsSource = $product->getDataFieldConfig('custom_options')['source']->getCustomOptions();
+        foreach (array_keys($customOptionsSource) as $optionKey) {
+            foreach ($expectedCustomOptions as $expectedCustomOption) {
+                if ($customOptionsSource[$optionKey]['type'] === $expectedCustomOption['optionType']) {
+                    $options = array_keys($customOptionsSource[$optionKey]['options']);
+                    $optionField = $expectedCustomOption['optionField'];
+                    $optionValue = $expectedCustomOption['optionValue'];
+                    foreach ($options as $optionsKey) {
+                        $customOptionsSource[$optionKey]['options'][$optionsKey][$optionField] = $optionValue;
+                    }
+                }
+            }
+        }
+
+        return ['custom_options' => $customOptionsSource];
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Custom option values are same as expected.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertFileExtensionHints.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertFileExtensionHints.php
new file mode 100644
index 00000000000..5e744ce1ef8
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertFileExtensionHints.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Test\Constraint;
+
+use Magento\Catalog\Test\Block\Adminhtml\Product\ProductForm;
+use Magento\Catalog\Test\Page\Adminhtml\CatalogProductEdit;
+use Magento\Mtf\Constraint\AbstractAssertForm;
+
+/**
+ * Checks file_extension field hint on the product page custom options section.
+ */
+class AssertFileExtensionHints extends AbstractAssertForm
+{
+    /**
+     * Expected file_extension field hint.
+     *
+     * @var string
+     */
+    const EXPECTED_MESSAGE = 'Enter separated extensions, like: png, jpg, gif.';
+
+    /**
+     * Assert that file extension message is showed.
+     *
+     * @param CatalogProductEdit $productPage
+     * @return void
+     */
+    public function processAssert(CatalogProductEdit $productPage)
+    {
+        /** @var  ProductForm $productForm */
+        $productForm = $productPage->getProductForm();
+        $productForm->openSection('customer-options');
+        /** @var \Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Section\Options $options */
+        $options = $productForm->getSection('customer-options');
+        $fileOptionElements = $options->getFileOptionElements();
+        foreach ($fileOptionElements as $fileOptionElement) {
+            \PHPUnit\Framework\Assert::assertEquals(
+                self::EXPECTED_MESSAGE,
+                $fileOptionElement->getText(),
+                'Actual message differ from expected.'
+            );
+        }
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Assert correct file extensions hint is showed.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml
index 9270ec19c2a..c00e3526e5d 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml
@@ -1096,7 +1096,7 @@
                 <item name="is_in_stock" xsi:type="string">Out of Stock</item>
             </field>
             <field name="price" xsi:type="array">
-                <item name="value" xsi:type="string">560</item>
+                <item name="value" xsi:type="string">561</item>
             </field>
             <field name="tax_class_id" xsi:type="array">
                 <item name="dataset" xsi:type="string">taxable_goods</item>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/CustomOptions.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/CustomOptions.xml
index c98a3dd46f7..233d9f85930 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/CustomOptions.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/CustomOptions.xml
@@ -726,5 +726,21 @@
                 </item>
             </field>
         </dataset>
+
+        <dataset name="file_option_type">
+            <field name="0" xsi:type="array">
+                <item name="title" xsi:type="string">custom option file %isolation%</item>
+                <item name="is_require" xsi:type="string">Yes</item>
+                <item name="type" xsi:type="string">File/File</item>
+                <item name="options" xsi:type="array">
+                    <item name="0" xsi:type="array">
+                        <item name="price" xsi:type="string">40</item>
+                        <item name="price_type" xsi:type="string">Percent</item>
+                        <item name="sku" xsi:type="string">file_option</item>
+                        <item name="file_extension" xsi:type="string">jpg, jpg gif .png</item>
+                    </item>
+                </item>
+            </field>
+        </dataset>
     </repository>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml
index b10a47b6350..a840b81a5d2 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/CreateCategoryEntityTest.xml
@@ -175,5 +175,15 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategorySaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryOnCustomWebsite" />
         </variation>
+        <variation name="CreateCategoryEntityTestVariation11_ProductsGridFilter" summary="Apply category products grid filter">
+            <data name="addCategory" xsi:type="string">addSubcategory</data>
+            <data name="category/data/parent_id/dataset" xsi:type="string">default_category</data>
+            <data name="category/data/is_active" xsi:type="string">Yes</data>
+            <data name="category/data/include_in_menu" xsi:type="string">Yes</data>
+            <data name="category/data/name" xsi:type="string">Subcategory%isolation%</data>
+            <data name="category/data/category_products/dataset" xsi:type="string">catalogProductSimple::default, catalogProductSimple::not_visible_individually</data>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertCategorySaveMessage" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertCategoryProductsGridFilter" />
+        </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml
index 60af58cae5a..c0f05e6cfb9 100644
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml
@@ -219,5 +219,24 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductOutOfStock" />
         </variation>
+        <variation name="CreateSimpleProductWithFileOption" summary="Check that Compatible File Extensions are parsed correctly" ticketId="MAGETWO-89344">
+            <data name="description" xsi:type="string">Create product with file option</data>
+            <data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
+            <data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
+            <data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
+            <data name="product/data/price/value" xsi:type="string">1000</data>
+            <data name="product/data/quantity_and_stock_status/qty" xsi:type="string">100</data>
+            <data name="product/data/custom_options/dataset" xsi:type="string">file_option_type</data>
+            <data name="expectedCustomOptions" xsi:type="array">
+                <item name="0" xsi:type="array">
+                    <item name="optionType" xsi:type="string">File/File</item>
+                    <item name="optionField" xsi:type="string">file_extension</item>
+                    <item name="optionValue" xsi:type="string">jpg, gif, png</item>
+                </item>
+            </data>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertCustomOptions" />
+            <constraint name="Magento\Catalog\Test\Constraint\AssertFileExtensionHints" />
+        </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductOutOfStockPage.php b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductOutOfStockPage.php
index cf1b2321a55..8bd06f88ad1 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductOutOfStockPage.php
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Constraint/AssertConfigurableProductOutOfStockPage.php
@@ -30,16 +30,25 @@ protected function verify()
     protected function verifyPrice()
     {
         $priceBlock = $this->productView->getPriceBlock();
-        if (!$priceBlock->isVisible()) {
-            return "Price block for '{$this->product->getName()}' product' is not visible.";
-        }
-        $formPrice = $priceBlock->isOldPriceVisible() ? $priceBlock->getOldPrice() : $priceBlock->getPrice();
         $fixturePrice = $this->getLowestConfigurablePrice();
 
-        if ($fixturePrice != $formPrice) {
-            return "Displayed product price on product page (front-end) not equals passed from fixture. "
-                . "Actual: {$formPrice}, expected: {$fixturePrice}.";
+        if ($fixturePrice === null) {
+            if ($priceBlock->isVisible()) {
+                return "Price block for '{$this->product->getName()}' product' is visible.";
+            }
+        } else {
+            if (!$priceBlock->isVisible()) {
+                return "Price block for '{$this->product->getName()}' product' is not visible.";
+            }
+
+            $formPrice = $priceBlock->isOldPriceVisible() ? $priceBlock->getOldPrice() : $priceBlock->getPrice();
+
+            if ($fixturePrice != $formPrice) {
+                return "Displayed product price on product page (front-end) not equals passed from fixture. "
+                    . "Actual: {$formPrice}, expected: {$fixturePrice}.";
+            }
         }
+
         return null;
     }
 
@@ -61,10 +70,13 @@ protected function getLowestConfigurablePrice()
 
         if (null === $price) {
             $configurableOptions = $this->product->getConfigurableAttributesData();
-            foreach ($configurableOptions['matrix'] as $option) {
-                $price = $price === null ? $option['price'] : $price;
-                if ($price > $option['price']) {
-                    $price = $option['price'];
+            $products = $this->product->getDataFieldConfig('configurable_attributes_data')['source']->getProducts();
+            foreach ($configurableOptions['matrix'] as $key => $option) {
+                if ($products[$key]->getQuantityAndStockStatus()['is_in_stock'] !== 'Out of Stock') {
+                    $price = $price === null ? $option['price'] : $price;
+                    if ($price > $option['price']) {
+                        $price = $option['price'];
+                    }
                 }
             }
         }
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml
index 8bf30474d25..e1b6fcf47e5 100644
--- a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml
+++ b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/TestCase/CreateConfigurableProductEntityTest.xml
@@ -237,18 +237,36 @@
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductInCategory" />
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductImages" />
         </variation>
-        <variation name="CreateConfigurableProductEntityTestVariation15" summary="Create configurable product with one out of stock and several in stock options" ticketId="MAGETWO-69508">
+        <variation name="CreateConfigurableProductEntityTestVariation15" summary="Create Configurable Product with 1 out of stock and several in stock options with displaying out of stock ones" ticketId="MAGETWO-89274">
             <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
             <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">three_new_options_with_out_of_stock_product</data>
             <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
             <data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
-            <data name="product/data/price/value" xsi:type="string">1</data>
+            <data name="product/data/price/value" xsi:type="string">560</data>
+            <data name="product/data/weight" xsi:type="string">2</data>
+            <data name="product/data/category_ids/dataset" xsi:type="string">default_subcategory</data>
+            <data name="product/data/short_description" xsi:type="string">Configurable short description</data>
+            <data name="product/data/description" xsi:type="string">Configurable Product description %isolation%</data>
+            <data name="outOfStockOption" xsi:type="string">SIZE_S</data>
+            <data name="configData">display_out_of_stock_products</data>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
+            <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductInCategory" />
+            <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertOutOfStockOptionIsAbsentOnProductPage" />
+        </variation>
+        <variation name="CreateConfigurableProductEntityTestVariation16" summary="Create Configurable Product with 1 out of stock and several in stock options" ticketId="MAGETWO-69508">
+            <data name="product/data/url_key" xsi:type="string">configurable-product-%isolation%</data>
+            <data name="product/data/configurable_attributes_data/dataset" xsi:type="string">three_new_options_with_out_of_stock_product</data>
+            <data name="product/data/name" xsi:type="string">Configurable Product %isolation%</data>
+            <data name="product/data/sku" xsi:type="string">configurable_sku_%isolation%</data>
+            <data name="product/data/price/value" xsi:type="string">560</data>
             <data name="product/data/weight" xsi:type="string">2</data>
             <data name="product/data/category_ids/dataset" xsi:type="string">default_subcategory</data>
             <data name="product/data/short_description" xsi:type="string">Configurable short description</data>
             <data name="product/data/description" xsi:type="string">Configurable Product description %isolation%</data>
             <data name="outOfStockOption" xsi:type="string">SIZE_S</data>
+            <data name="configData">display_out_of_stock_products_rollback</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
+            <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertConfigurableProductInCategory" />
             <constraint name="Magento\ConfigurableProduct\Test\Constraint\AssertOutOfStockOptionIsAbsentOnProductPage" />
         </variation>
     </testCase>
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendStep.php b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendStep.php
index 8faab8e751f..4f7e6deed7a 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendStep.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/TestStep/LoginUserOnBackendStep.php
@@ -7,9 +7,10 @@
 namespace Magento\User\Test\TestStep;
 
 use Magento\Backend\Test\Page\AdminAuthLogin;
+use Magento\Backend\Test\Page\Adminhtml\Dashboard;
+use Magento\Mtf\Client\BrowserInterface;
 use Magento\Mtf\TestStep\TestStepInterface;
 use Magento\User\Test\Fixture\User;
-use Magento\Backend\Test\Page\Adminhtml\Dashboard;
 
 /**
  * Login user on backend.
@@ -44,23 +45,43 @@ class LoginUserOnBackendStep implements TestStepInterface
      */
     protected $dashboard;
 
+    /**
+     * Browser.
+     *
+     * @var BrowserInterface
+     */
+    private $browser;
+
+    /**
+     * Array of error messages on admin login form.
+     *
+     * @var array
+     */
+    private $errorMessages = [
+        'Invalid Form Key. Please refresh the page.',
+        'Your current session has been expired.',
+    ];
+
     /**
      * @constructor
      * @param LogoutUserOnBackendStep $logoutUserOnBackendStep
      * @param AdminAuthLogin $adminAuth
      * @param User $user
      * @param Dashboard $dashboard
+     * @param BrowserInterface $browser
      */
     public function __construct(
         LogoutUserOnBackendStep $logoutUserOnBackendStep,
         AdminAuthLogin $adminAuth,
         User $user,
-        Dashboard $dashboard
+        Dashboard $dashboard,
+        BrowserInterface $browser
     ) {
         $this->logoutUserOnBackendStep = $logoutUserOnBackendStep;
         $this->adminAuth = $adminAuth;
         $this->user = $user;
         $this->dashboard = $dashboard;
+        $this->browser = $browser;
     }
 
     /**
@@ -76,10 +97,30 @@ public function run()
             $this->logoutUserOnBackendStep->run();
         }
 
+        try {
+            $this->login();
+        } catch (\PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
+            if (strpos($e->getMessage(), 'Timed out after') !== false) {
+                $messages = $this->adminAuth->getMessagesBlock();
+                if (in_array($messages->getErrorMessage(), $this->errorMessages, true)) {
+                    $this->browser->refresh();
+                    $this->login();
+                }
+            }
+        }
+
+        $this->dashboard->getSystemMessageDialog()->closePopup();
+    }
+
+    /**
+     * Login.
+     *
+     * @return void
+     */
+    private function login()
+    {
         $this->adminAuth->getLoginBlock()->fill($this->user);
         $this->adminAuth->getLoginBlock()->submit();
         $this->adminAuth->getLoginBlock()->waitFormNotVisible();
-
-        $this->dashboard->getSystemMessageDialog()->closePopup();
     }
 }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php
index 6ab28f1456a..6f6f1b9d818 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php
@@ -203,7 +203,8 @@ protected function _applyFixtures(array $fixtures)
      */
     protected function _revertFixtures()
     {
-        foreach ($this->_appliedFixtures as $fixture) {
+        $appliedFixtures = array_reverse($this->_appliedFixtures);
+        foreach ($appliedFixtures as $fixture) {
             if (is_callable($fixture)) {
                 $fixture[1] .= 'Rollback';
                 if (is_callable($fixture)) {
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Helper/Amqp.php b/dev/tests/integration/framework/Magento/TestFramework/Helper/Amqp.php
index ab209ab21ad..992b980d6a8 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Helper/Amqp.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Helper/Amqp.php
@@ -3,9 +3,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\TestFramework\Helper;
 
-use Magento\Framework\HTTP\Client\Curl;
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Helper;
 
 /**
  * Helper class to access RabbitMQ server configuration
@@ -62,4 +63,51 @@ public function getExchangeBindings($name)
         $data = $this->curl->getBody();
         return json_decode($data, true);
     }
+
+    /**
+     * Get All available connections
+     *
+     * @return array
+     */
+    public function getConnections()
+    {
+        $this->curl->get($this->host . 'connections');
+        $data = $this->curl->getBody();
+        $data = json_decode($data, true);
+        $output = [];
+        foreach ($data as $value) {
+            $output[$value['name']] = $value;
+        }
+        return $output;
+    }
+
+    /**
+     * @param string $name
+     * @param int $numMessages
+     * @return string
+     */
+    public function clearQueue(string $name, int $numMessages = 50)
+    {
+        $body = [
+            "count" => $numMessages,
+            "ackmode" => "ack_requeue_false",
+            "encoding" => "auto",
+            "truncate" => 50000
+        ];
+        $this->curl->post($this->host . 'queue/%2f/' . $name . '/get', json_encode($body));
+        return $this->curl->getBody();
+    }
+
+    /**
+     * Delete connection
+     *
+     * @param $name
+     * @return string $data
+     */
+    public function deleteConnection($name)
+    {
+        $this->curl->delete($this->host . 'conections/' . urlencode($name));
+        $data = $this->curl->getBody();
+        return $data;
+    }
 }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Helper/Curl.php b/dev/tests/integration/framework/Magento/TestFramework/Helper/Curl.php
new file mode 100644
index 00000000000..62b753cf5d3
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/Helper/Curl.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Helper;
+
+use Magento\Framework\HTTP\Client\Curl as CurlLibrary;
+
+class Curl extends CurlLibrary
+{
+    /**
+     * Make DELETE request
+     *
+     * String type was added to parameter $param in order to support sending JSON or XML requests.
+     * This feature was added base on Community Pull Request https://github.com/magento/magento2/pull/8373
+     *
+     * @param string $uri
+     * @return void
+     *
+     * @see \Magento\Framework\HTTP\Client#post($uri, $params)
+     */
+    public function delete($uri)
+    {
+        $this->makeRequest("DELETE", $uri);
+    }
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/EnvironmentPreconditionException.php b/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/EnvironmentPreconditionException.php
new file mode 100644
index 00000000000..474e7215bef
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/EnvironmentPreconditionException.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\MessageQueue;
+
+class EnvironmentPreconditionException extends \Exception
+{
+
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PreconditionFailedException.php b/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PreconditionFailedException.php
new file mode 100644
index 00000000000..270e4e8c013
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PreconditionFailedException.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\TestFramework\MessageQueue;
+
+class PreconditionFailedException extends \Exception
+{
+
+}
diff --git a/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php b/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php
new file mode 100644
index 00000000000..14847ae5066
--- /dev/null
+++ b/dev/tests/integration/framework/Magento/TestFramework/MessageQueue/PublisherConsumerController.php
@@ -0,0 +1,194 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\TestFramework\MessageQueue;
+
+use Magento\Framework\MessageQueue\PublisherInterface;
+use Magento\Framework\OsInfo;
+use Magento\TestFramework\Helper\Amqp;
+
+class PublisherConsumerController
+{
+    /**
+     * @var string[]
+     */
+    private $consumers = [];
+
+    /**
+     * @var PublisherInterface
+     */
+    private $publisher;
+
+    /**
+     * @var string
+     */
+    private $logFilePath;
+
+    /**
+     * @var int|null
+     */
+    private $maxMessages = null;
+
+    /**
+     * @var OsInfo
+     */
+    private $osInfo;
+
+    /**
+     * @var array
+     */
+    private $appInitParams;
+
+    /**
+     * @var Amqp
+     */
+    private $amqpHelper;
+
+    public function __construct(
+        PublisherInterface $publisher,
+        OsInfo $osInfo,
+        Amqp $amqpHelper,
+        $logFilePath,
+        $consumers,
+        $appInitParams,
+        $maxMessages = null
+    ) {
+        $this->consumers = $consumers;
+        $this->publisher = $publisher;
+        $this->logFilePath = $logFilePath;
+        $this->maxMessages = $maxMessages;
+        $this->osInfo = $osInfo;
+        $this->appInitParams = $appInitParams;
+        $this->amqpHelper = $amqpHelper;
+    }
+
+    /**
+     * Initialize Environment and Consumers
+     *
+     * @throws EnvironmentPreconditionException
+     * @throws PreconditionFailedException
+     */
+    public function initialize()
+    {
+        if ($this->osInfo->isWindows()) {
+            throw new EnvironmentPreconditionException(
+                "This test relies on *nix shell and should be skipped in Windows environment."
+            );
+        }
+        $connections = $this->amqpHelper->getConnections();
+        foreach (array_keys($connections) as $connectionName) {
+            $this->amqpHelper->deleteConnection($connectionName);
+        }
+        $this->amqpHelper->clearQueue("async.operations.all");
+        foreach ($this->consumers as $consumer) {
+            foreach ($this->getConsumerProcessIds($consumer) as $consumerProcessId) {
+                exec("kill {$consumerProcessId}");
+            }
+        }
+        foreach ($this->consumers as $consumer) {
+            if (!$this->getConsumerProcessIds($consumer)) {
+                exec("{$this->getConsumerStartCommand($consumer, true)} > /dev/null &");
+            }
+            sleep(5);
+        }
+
+        if (file_exists($this->logFilePath)) {
+            // try to remove before failing the test
+            unlink($this->logFilePath);
+            if (file_exists($this->logFilePath)) {
+                throw new PreconditionFailedException(
+                    "Precondition failed: test log ({$this->logFilePath}) cannot be deleted before test execution."
+                );
+            }
+        }
+    }
+
+    /**
+     * Stop Consumers
+     */
+    public function stopConsumers()
+    {
+        foreach ($this->consumers as $consumer) {
+            foreach ($this->getConsumerProcessIds($consumer) as $consumerProcessId) {
+                exec("kill {$consumerProcessId}");
+            }
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function getConsumersProcessIds()
+    {
+        $consumers = [];
+        foreach ($this->consumers as $consumer) {
+            $consumers[$consumer] = $this->getConsumerProcessIds($consumer);
+        }
+        return $consumers;
+    }
+
+    /**
+     * @param string $consumer
+     * @return string[]
+     */
+    private 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
+     */
+    private function getConsumerStartCommand($consumer, $withEnvVariables = false)
+    {
+        $binDirectory = realpath(INTEGRATION_TESTS_DIR . '/bin/');
+        $magentoCli = $binDirectory . '/magento';
+        $consumerStartCommand = "php {$magentoCli} queue:consumers:start -vvv " . $consumer;
+        if ($this->maxMessages) {
+            $consumerStartCommand .= " --max-messages={$this->maxMessages}";
+        }
+        if ($withEnvVariables) {
+            $params = $this->appInitParams;
+            $params['MAGE_DIRS']['base']['path'] = BP;
+            $params = 'INTEGRATION_TEST_PARAMS="' . urldecode(http_build_query($params)) . '"';
+            $consumerStartCommand = $params . ' ' . $consumerStartCommand;
+        }
+        return $consumerStartCommand;
+    }
+
+    /**
+     * @param callable $condition
+     * @param $params
+     * @throws PreconditionFailedException
+     */
+    public function waitForAsynchronousResult(callable $condition, $params)
+    {
+        $i = 0;
+        do {
+            sleep(1);
+            $assertion = call_user_func_array($condition, $params);
+        } while (!$assertion && ($i++ < 180));
+
+        if (!$assertion) {
+            throw new PreconditionFailedException("No asynchronous messages were processed.");
+        }
+    }
+
+    /**
+     * @return PublisherInterface
+     */
+    public function getPublisher()
+    {
+        return $this->publisher;
+    }
+}
diff --git a/dev/tests/integration/framework/bootstrap.php b/dev/tests/integration/framework/bootstrap.php
index 4e14c8113a7..1cae393dc01 100644
--- a/dev/tests/integration/framework/bootstrap.php
+++ b/dev/tests/integration/framework/bootstrap.php
@@ -15,6 +15,10 @@
     define('TESTS_TEMP_DIR', $testsBaseDir . '/tmp');
 }
 
+if (!defined('INTEGRATION_TESTS_DIR')) {
+    define('INTEGRATION_TESTS_DIR', $testsBaseDir);
+}
+
 $testFrameworkDir = __DIR__;
 require_once 'deployTestModules.php';
 
diff --git a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php b/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php
deleted file mode 100644
index b6207f309ea..00000000000
--- a/dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Bootstrap/EnvironmentTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/**
- * Test class for \Magento\TestFramework\Bootstrap\Environment.
- */
-namespace Magento\Test\Bootstrap;
-
-class EnvironmentTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @var string
-     */
-    protected static $_sessionId = '';
-
-    /**
-     * @var \Magento\TestFramework\Bootstrap\Environment
-     */
-    protected $_object;
-
-    public static function setUpBeforeClass()
-    {
-        self::$_sessionId = session_id();
-    }
-
-    public static function tearDownAfterClass()
-    {
-        session_id(self::$_sessionId);
-    }
-
-    protected function setUp()
-    {
-        $this->_object = new \Magento\TestFramework\Bootstrap\Environment();
-    }
-
-    protected function tearDown()
-    {
-        $this->_object = null;
-    }
-
-    /**
-     * Retrieve the current session's variables
-     *
-     * @return array|null
-     */
-    protected function _getSessionVars()
-    {
-        return isset($_SESSION) ? $_SESSION : null;
-    }
-
-    public function testEmulateHttpRequest()
-    {
-        $serverVars = $_SERVER;
-        $this->assertNotEmpty($serverVars);
-
-        $expectedResult = ['HTTP_HOST' => 'localhost', 'SCRIPT_FILENAME' => 'index.php'];
-        $actualResult = ['HTTP_HOST' => '127.0.0.1'];
-        $this->_object->emulateHttpRequest($actualResult);
-        $this->assertEquals($expectedResult, $actualResult);
-
-        $this->assertSame($serverVars, $_SERVER, 'Super-global $_SERVER must not be affected.');
-    }
-
-    public function testEmulateSession()
-    {
-        $sessionVars = $this->_getSessionVars();
-        $this->assertEmpty(session_id());
-
-        $actualResult = ['session_data_to_be_erased' => 'some_value'];
-        $this->_object->emulateSession($actualResult);
-        $this->assertEquals([], $actualResult);
-
-        $this->assertSame($sessionVars, $this->_getSessionVars(), 'Super-global $_SESSION must not be affected.');
-        $this->assertNotEmpty(session_id(), 'Global session identified has to be emulated.');
-    }
-}
diff --git a/dev/tests/integration/phpunit.xml.dist b/dev/tests/integration/phpunit.xml.dist
index 7ed1ada02ef..dedc144c567 100644
--- a/dev/tests/integration/phpunit.xml.dist
+++ b/dev/tests/integration/phpunit.xml.dist
@@ -21,6 +21,7 @@
         </testsuite>
         <testsuite name="Magento Integration Tests">
             <directory suffix="Test.php">testsuite</directory>
+            <directory suffix="Test.php">../../../app/code/*/*/Test/Integration</directory>
             <exclude>testsuite/Magento/MemoryUsageTest.php</exclude>
         </testsuite>
     </testsuites>
diff --git a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/_files/create_products.php b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/_files/create_products.php
index 492a9575423..f625ee3288d 100644
--- a/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/_files/create_products.php
+++ b/dev/tests/integration/testsuite/Magento/AdvancedPricingImportExport/_files/create_products.php
@@ -16,7 +16,7 @@
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
     ->setCateroryIds([])
-    ->setStockData(['qty' => 100, 'is_in_stock' => 1])
+    ->setStockData(['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1])
     ->setIsObjectNew(true)
     ->save();
 
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkManagementTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkManagementTest.php
index 5ecc274c5bb..940eb769298 100644
--- a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkManagementTest.php
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/BulkManagementTest.php
@@ -6,6 +6,7 @@
 namespace Magento\AsynchronousOperations\Model;
 
 use Magento\AsynchronousOperations\Api\Data\BulkSummaryInterface;
+use Magento\AsynchronousOperations\Api\Data\DetailedOperationStatusInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\AsynchronousOperations\Api\Data\OperationInterface;
@@ -135,7 +136,7 @@ private function getStoredOperationData()
     {
         /** @var MetadataPool $metadataPool */
         $metadataPool = $this->objectManager->get(MetadataPool::class);
-        $operationMetadata = $metadataPool->getMetadata(OperationInterface::class);
+        $operationMetadata = $metadataPool->getMetadata(DetailedOperationStatusInterface::class);
         /** @var ResourceConnection $resourceConnection */
         $resourceConnection = $this->objectManager->get(ResourceConnection::class);
         $connection = $resourceConnection->getConnectionByName($operationMetadata->getEntityConnectionName());
diff --git a/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php
new file mode 100644
index 00000000000..305c3550269
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/AsynchronousOperations/Model/MassScheduleTest.php
@@ -0,0 +1,300 @@
+<?php
+/**
+ * Test services for name collisions.
+ *
+ * Let we have two service interfaces called Foo\Bar\Service\SomeBazV1Interface and Foo\Bar\Service\Some\BazV1Interface.
+ * Given current name generation logic both are going to be translated to BarSomeBazV1. This test checks such things
+ * are not going to happen.
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\AsynchronousOperations\Model;
+
+use Magento\Framework\Exception\BulkException;
+use Magento\Framework\Phrase;
+use Magento\Framework\Registry;
+use Magento\Framework\Webapi\Exception;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\TestFramework\MessageQueue\PublisherConsumerController;
+use Magento\TestFramework\MessageQueue\EnvironmentPreconditionException;
+use Magento\TestFramework\MessageQueue\PreconditionFailedException;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class MassScheduleTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var string[]
+     */
+    protected $consumers = ['async.operations.all'];
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    protected $objectManager;
+
+    /**
+     * @var MassSchedule
+     */
+    private $massSchedule;
+
+    /**
+     * @var Collection
+     */
+    private $collection;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var PublisherConsumerController
+     */
+    private $publisherConsumerController;
+
+    /**
+     * @var array
+     */
+    private $skus = [];
+
+    /**
+     * @var Registry
+     */
+    private $registry;
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->registry = $this->objectManager->get(Registry::class);
+        $this->massSchedule = $this->objectManager->create(MassSchedule::class);
+        $this->logFilePath = TESTS_TEMP_DIR . "/MessageQueueTestLog.txt";
+        $this->collection = $this->objectManager->create(Collection::class);
+        $this->productRepository = $this->objectManager->create(ProductRepositoryInterface::class);
+        /** @var PublisherConsumerController publisherConsumerController */
+        $this->publisherConsumerController = $this->objectManager->create(PublisherConsumerController::class, [
+            'consumers' => $this->consumers,
+            'logFilePath' => $this->logFilePath,
+            'appInitParams' => \Magento\TestFramework\Helper\Bootstrap::getInstance()->getAppInitParams()
+        ]);
+
+        try {
+            $this->publisherConsumerController->initialize();
+        } catch (EnvironmentPreconditionException $e) {
+            $this->markTestSkipped($e->getMessage());
+        } catch (PreconditionFailedException $e) {
+            $this->fail($e->getMessage());
+        }
+
+        parent::setUp();
+    }
+
+    /**
+     * @dataProvider productDataProvider
+     * @param ProductInterface[] $products
+     */
+    public function testScheduleMass($products)
+    {
+        try {
+            $this->sendBulk($products);
+        } catch (BulkException $bulkException) {
+            $this->fail('Bulk was not accepted in full');
+        }
+
+        //assert all products are created
+        try {
+            $this->publisherConsumerController->waitForAsynchronousResult(
+                [$this, 'assertProductExists'],
+                [$this->skus, count($this->skus)]
+            );
+        } catch (PreconditionFailedException $e) {
+            $this->fail("Not all products were created");
+        }
+    }
+
+    public function sendBulk($products)
+    {
+        $this->skus = [];
+        foreach ($products as $data) {
+            if (isset($data['product'])) {
+                $this->skus[] = $data['product']->getSku();
+            }
+        }
+        $this->clearProducts();
+
+        $result = $this->massSchedule->publishMass('async.V1.products.POST', $products);
+
+        //assert bulk accepted with no errors
+        $this->assertFalse($result->isErrors());
+
+        //assert number of products sent to queue
+        $this->assertCount(count($this->skus), $result->getRequestItems());
+    }
+
+    public function tearDown()
+    {
+        $this->publisherConsumerController->stopConsumers();
+        $this->clearProducts();
+
+        parent::tearDown();
+    }
+
+    private function clearProducts()
+    {
+        $size = $this->objectManager->create(Collection::class)
+            ->addAttributeToFilter('sku', ['in' => $this->skus])
+            ->load()
+            ->getSize();
+
+        if ($size == 0) {
+            return;
+        }
+
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', true);
+        try {
+            foreach ($this->skus as $sku) {
+                $this->productRepository->deleteById($sku);
+            }
+        } catch (\Exception $e) {
+            //nothing to delete
+        }
+        $this->registry->unregister('isSecureArea');
+
+        $size = $this->objectManager->create(Collection::class)
+            ->addAttributeToFilter('sku', ['in' => $this->skus])
+            ->load()
+            ->getSize();
+
+        if ($size > 0) {
+            throw new Exception(new Phrase("Collection size after clearing the products: %size", ['size' => $size]));
+        }
+    }
+
+    public function assertProductExists($productsSkus, $count)
+    {
+        $collection = $this->objectManager->create(Collection::class)
+            ->addAttributeToFilter('sku', ['in' => $productsSkus])
+            ->load();
+        $size = $collection->getSize();
+        return $size == $count;
+    }
+
+    /**
+     * @dataProvider productExceptionDataProvider
+     * @param ProductInterface[] $products
+     */
+    public function testScheduleMassOneEntityFailure($products)
+    {
+        try {
+            $this->sendBulk($products);
+        } catch (BulkException $e) {
+            $this->assertCount(1, $e->getErrors());
+
+            $errors = $e->getErrors();
+            $this->assertInstanceOf(\Magento\Framework\Exception\LocalizedException::class, $errors[0]);
+
+            $this->assertEquals("Error processing 1 element of input data", $errors[0]->getMessage());
+
+            $reasonException = $errors[0]->getPrevious();
+
+            $expectedErrorMessage = "Data item corresponding to \"product\" " .
+                "must be specified in the message with topic " .
+                "\"async.V1.products.POST\".";
+            $this->assertEquals(
+                $expectedErrorMessage,
+                $reasonException->getMessage()
+            );
+
+            /** @var \Magento\WebapiAsync\Model\AsyncResponse $bulkStatus */
+            $bulkStatus = $e->getData();
+            $this->assertTrue($bulkStatus->isErrors());
+
+            /** @var ItemStatus[] $items */
+            $items = $bulkStatus->getRequestItems();
+            $this->assertCount(2, $items);
+
+            $this->assertEquals(ItemStatus::STATUS_ACCEPTED, $items[0]->getStatus());
+            $this->assertEquals(0, $items[0]->getId());
+
+            $this->assertEquals(ItemStatus::STATUS_REJECTED, $items[1]->getStatus());
+            $this->assertEquals(1, $items[1]->getId());
+            $this->assertEquals($expectedErrorMessage, $items[1]->getErrorMessage());
+        }
+
+        //assert one products is created
+        try {
+            $this->publisherConsumerController->waitForAsynchronousResult(
+                [$this, 'assertProductExists'],
+                [$this->skus, count($this->skus)]
+            );
+        } catch (PreconditionFailedException $e) {
+            $this->fail("Not all products were created");
+        }
+    }
+
+    private function getProduct()
+    {
+        /** @var $product \Magento\Catalog\Model\Product */
+        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(ProductInterface::class);
+        $product
+            ->setTypeId('simple')
+            ->setAttributeSetId(4)
+            ->setWebsiteIds([1])
+            ->setName('Simple Product 1')
+            ->setSku('unique-simple-product1')
+            ->setPrice(10)
+            ->setMetaTitle('meta title')
+            ->setMetaKeyword('meta keyword')
+            ->setMetaDescription('meta description')
+            ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
+            ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+            ->setStockData(['use_config_manage_stock' => 0]);
+        return $product;
+    }
+
+    public function productDataProvider()
+    {
+        return [
+            'single_product' => [
+                [['product' => $this->getProduct()]],
+            ],
+            'multiple_products' => [
+                [
+                    ['product' => $this->getProduct()
+                        ->setName('Simple Product 3')
+                        ->setSku('unique-simple-product3')
+                        ->setMetaTitle('meta title 3')
+                    ],
+                    ['product' => $this->getProduct()
+                        ->setName('Simple Product 2')
+                        ->setSku('unique-simple-product2')
+                        ->setMetaTitle('meta title 2')
+                    ]
+                ]
+            ],
+        ];
+    }
+
+    public function productExceptionDataProvider()
+    {
+        return [
+            'single_product' => [
+                [['product' => $this->getProduct()]],
+            ],
+            'multiple_products' => [
+                [
+                    ['product' => $this->getProduct()],
+                    ['customer' => $this->getProduct()]
+                ]
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Payment/GetClientTokenTest.php b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Payment/GetClientTokenTest.php
new file mode 100644
index 00000000000..cc5ddc7dc97
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/Controller/Adminhtml/Payment/GetClientTokenTest.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Braintree\Controller\Adminhtml\Payment;
+
+use Braintree\Configuration;
+use Magento\Backend\Model\Session\Quote;
+use Magento\Braintree\Gateway\Config\Config;
+use Magento\Braintree\Model\Adapter\BraintreeAdapter;
+use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+
+/**
+ * Tests \Magento\Braintree\Controller\Adminhtml\Payment\GetClientToken
+ */
+class GetClientTokenTest extends AbstractBackendController
+{
+    /**
+     * @var Quote
+     */
+    private $quoteSession;
+
+    /**
+     * @var ObjectManager|MockObject $stubObjectManager
+     */
+    private $stubObjectManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->quoteSession = $this->_objectManager->get(Quote::class);
+
+        $this->stubObjectManager = $this->getMockBuilder(ObjectManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $adapterFactory = new BraintreeAdapterFactory(
+            $this->stubObjectManager,
+            $this->_objectManager->get(Config::class)
+        );
+
+        $this->_objectManager->addSharedInstance($adapterFactory, BraintreeAdapterFactory::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->_objectManager->removeSharedInstance(BraintreeAdapterFactory::class);
+        parent::tearDown();
+    }
+
+    /**
+     * Checks if client token will retrieved from Braintree initialized with default scope.
+     *
+     * @magentoDataFixture Magento/Braintree/_files/payment_configuration.php
+     * @magentoAppArea adminhtml
+     */
+    public function testExecute()
+    {
+        $this->perform(
+            'def_merchant_id',
+            'def_public_key',
+            'def_private_key'
+        );
+    }
+
+    /**
+     * Checks if client token will be retrieved from Braintree initialized per store.
+     *
+     * @magentoDataFixture Magento/Braintree/_files/payment_configuration.php
+     * @magentoAppArea adminhtml
+     */
+    public function testExecuteWithStoreConfiguration()
+    {
+        /** @var StoreRepositoryInterface $storeRepository */
+        $storeRepository = $this->_objectManager->get(StoreRepositoryInterface::class);
+        $store = $storeRepository->get('test');
+        $this->quoteSession->setStoreId($store->getId());
+
+        $this->perform(
+            'store_merchant_id',
+            'store_public_key',
+            'def_private_key' // should be read from default scope
+        );
+    }
+
+    /**
+     * Checks if client token will be retrieved from Braintree initialized per website.
+     *
+     * @magentoDataFixture Magento/Braintree/_files/payment_configuration.php
+     * @magentoAppArea adminhtml
+     */
+    public function testExecuteWithWebsiteConfiguration()
+    {
+        /** @var StoreRepositoryInterface $storeRepository */
+        $storeRepository = $this->_objectManager->get(StoreRepositoryInterface::class);
+        $store = $storeRepository->get('fixture_second_store');
+        $this->quoteSession->setStoreId($store->getId());
+
+        $this->perform(
+            'website_merchant_id',
+            'def_public_key', // should be read from default scope
+            'website_private_key'
+        );
+    }
+
+    /**
+     * Perform test.
+     *
+     * @param string $merchantId
+     * @param string $publicKey
+     * @param string $privateKey
+     * @return void
+     */
+    private function perform($merchantId, $publicKey, $privateKey)
+    {
+        $args = [
+            'merchantId' => $merchantId,
+            'publicKey' => $publicKey,
+            'privateKey' => $privateKey,
+            'environment' => 'sandbox',
+        ];
+
+        $adapter = $this->getMockBuilder(BraintreeAdapter::class)
+            ->setConstructorArgs($args)
+            ->setMethods(['generate'])
+            ->getMock();
+        $adapter->method('generate')
+            ->willReturn('client_token');
+
+        $this->stubObjectManager->method('create')
+            ->with(BraintreeAdapter::class, $args)
+            ->willReturn($adapter);
+
+        $this->dispatch('backend/braintree/payment/getClientToken');
+
+        /** @var SerializerInterface $serializer */
+        $serializer = $this->_objectManager->get(SerializerInterface::class);
+        $decoded = $serializer->unserialize($this->getResponse()->getBody());
+        $this->performAsserts($decoded['clientToken'], $merchantId, $publicKey, $privateKey);
+    }
+
+    /**
+     * Perform Asserts.
+     *
+     * @param string $clientToken
+     * @param string $merchantId
+     * @param string $publicKey
+     * @param string $privateKey
+     * @return void
+     */
+    private function performAsserts($clientToken, $merchantId, $publicKey, $privateKey)
+    {
+        self::assertEquals('client_token', $clientToken);
+        self::assertEquals(Configuration::merchantId(), $merchantId);
+        self::assertEquals(Configuration::publicKey(), $publicKey);
+        self::assertEquals(Configuration::privateKey(), $privateKey);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/_files/payment_configuration.php b/dev/tests/integration/testsuite/Magento/Braintree/_files/payment_configuration.php
new file mode 100644
index 00000000000..da87ad5311d
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/_files/payment_configuration.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Config\Model\Config;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Encryption\EncryptorInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var EncryptorInterface $encryptor */
+$encryptor = $objectManager->get(EncryptorInterface::class);
+
+$processConfigData = function (Config $config, array $data) {
+    foreach ($data as $key => $value) {
+        $config->setDataByPath($key, $value);
+        $config->save();
+    }
+};
+
+// save payment configuration for the default scope
+$configData = [
+    'payment/braintree/merchant_id' => 'def_merchant_id',
+    'payment/braintree/public_key' => $encryptor->encrypt('def_public_key'),
+    'payment/braintree/private_key' => $encryptor->encrypt('def_private_key'),
+];
+/** @var Config $defConfig */
+$defConfig = $objectManager->create(Config::class);
+$defConfig->setScope(ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
+$processConfigData($defConfig, $configData);
+
+// save payment configuration per store
+require __DIR__ . '/../../Store/_files/store.php';
+$storeConfigData = [
+    'payment/braintree/merchant_id' => 'store_merchant_id',
+    'payment/braintree/public_key' => $encryptor->encrypt('store_public_key'),
+];
+/** @var Config $storeConfig */
+$storeConfig = $objectManager->create(Config::class);
+$storeConfig->setScope(ScopeInterface::SCOPE_STORES);
+$storeConfig->setStore('test');
+$processConfigData($storeConfig, $storeConfigData);
+
+// save payment website config data
+require __DIR__ . '/../../Store/_files/second_website_with_two_stores.php';
+$websiteConfigData = [
+    'payment/braintree/merchant_id' => 'website_merchant_id',
+    'payment/braintree/private_key' => $encryptor->encrypt('website_private_key'),
+];
+/** @var Config $websiteConfig */
+$websiteConfig = $objectManager->create(Config::class);
+$websiteConfig->setScope(ScopeInterface::SCOPE_WEBSITES);
+$websiteConfig->setWebsite($websiteId);
+$processConfigData($websiteConfig, $websiteConfigData);
diff --git a/dev/tests/integration/testsuite/Magento/Braintree/_files/payment_configuration_rollback.php b/dev/tests/integration/testsuite/Magento/Braintree/_files/payment_configuration_rollback.php
new file mode 100644
index 00000000000..0c0391769b0
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Braintree/_files/payment_configuration_rollback.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\Config\Storage\WriterInterface;
+use Magento\Store\Api\StoreRepositoryInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+
+$deleteConfigData = function (WriterInterface $writer, $scope, $scopeId) {
+    $configData = [
+        'payment/braintree/merchant_id',
+        'payment/braintree/public_key',
+        'payment/braintree/private_key',
+    ];
+    foreach ($configData as $path) {
+        $writer->delete($path, $scope, $scopeId);
+    }
+};
+
+/** @var WriterInterface $configWriter */
+$configWriter = $objectManager->get(WriterInterface::class);
+$deleteConfigData($configWriter, ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null);
+
+/** @var StoreRepositoryInterface $storeRepository */
+$storeRepository = $objectManager->get(StoreRepositoryInterface::class);
+$store = $storeRepository->get('test');
+$deleteConfigData($configWriter, ScopeInterface::SCOPE_STORES, $store->getId());
+
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$website = $websiteRepository->get('test');
+$deleteConfigData($configWriter, ScopeInterface::SCOPE_WEBSITES, $website->getId());
+
+require __DIR__ . '/../../Store/_files/second_website_with_two_stores_rollback.php';
+require __DIR__ . '/../../Store/_files/store_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/_files/products_advanced.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/_files/products_advanced.php
index 0920eff3c02..10731a48ee1 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/_files/products_advanced.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/_files/products_advanced.php
@@ -88,6 +88,7 @@
         [
             'qty' => 100,
             'is_in_stock' => 1,
+            'manage_stock' => 1,
         ]
     )->setWeight(
         18
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/_files/products_base.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/_files/products_base.php
index 1ad6efd3d0d..aa5fee237db 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/_files/products_base.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/Price/_files/products_base.php
@@ -98,6 +98,7 @@
             [
                 'qty' => 100,
                 'is_in_stock' => 1,
+                'manage_stock' => 1,
             ]
         )->setWeight(
             18
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/OptionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/OptionTest.php
new file mode 100644
index 00000000000..c9d5ed732df
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/OptionTest.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Catalog\Model\Product;
+
+use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * @magentoAppArea adminhtml
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation enabled
+ */
+class OptionTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Product repository.
+     *
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * Custom option factory.
+     *
+     * @var ProductCustomOptionInterfaceFactory
+     */
+    private $customOptionFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
+        $this->customOptionFactory = Bootstrap::getObjectManager()->create(ProductCustomOptionInterfaceFactory::class);
+    }
+
+    /**
+     * Tests removing ineligible characters from file_extension.
+     *
+     * @param string $rawExtensions
+     * @param string $expectedExtensions
+     * @dataProvider fileExtensionsDataProvider
+     * @magentoDataFixture Magento/Catalog/_files/product_without_options.php
+     */
+    public function testFileExtensions(string $rawExtensions, string $expectedExtensions)
+    {
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $this->productRepository->get('simple');
+        /** @var \Magento\Catalog\Model\Product\Option $fileOption */
+        $fileOption = $this->createFileOption($rawExtensions);
+        $product->addOption($fileOption);
+        $product->save();
+        $product = $this->productRepository->get('simple');
+        $fileOption = $product->getOptions()[0];
+        $actualExtensions = $fileOption->getFileExtension();
+        $this->assertEquals($expectedExtensions, $actualExtensions);
+    }
+
+    /**
+     * Data provider for testFileExtensions.
+     *
+     * @return array
+     */
+    public function fileExtensionsDataProvider()
+    {
+        return [
+            ['JPG, PNG, GIF', 'jpg, png, gif'],
+            ['jpg, jpg, jpg', 'jpg'],
+            ['jpg, png, gif', 'jpg, png, gif'],
+            ['jpg png gif', 'jpg, png, gif'],
+            ['!jpg@png#gif%', 'jpg, png, gif'],
+            ['jpg, png, 123', 'jpg, png, 123'],
+            ['', ''],
+        ];
+    }
+
+    /**
+     * Create file type option for product.
+     *
+     * @param string $rawExtensions
+     * @return \Magento\Catalog\Api\Data\ProductCustomOptionInterface|void
+     */
+    private function createFileOption(string $rawExtensions)
+    {
+        $data = [
+            'title' => 'file option',
+            'type' => 'file',
+            'is_require' => true,
+            'sort_order' => 3,
+            'price' => 30.0,
+            'price_type' => 'percent',
+            'sku' => 'sku3',
+            'file_extension' => $rawExtensions,
+            'image_size_x' => 10,
+            'image_size_y' => 20,
+        ];
+
+        return $this->customOptionFactory->create(['data' => $data]);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/website_attribute_sync_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/website_attribute_sync_rollback.php
index 7505e3430d5..307dbede649 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/website_attribute_sync_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/website_attribute_sync_rollback.php
@@ -76,12 +76,10 @@
 /**
  * remove website by id
  */
-$connection->delete(
-    $resourceConnection->getTableName('store_website'),
-    [
-        'website_id = ?' => $websiteId,
-    ]
-);
+/** @var \Magento\Store\Model\Website $website */
+$website = Bootstrap::getObjectManager()->create(\Magento\Store\Model\Website::class);
+$website->load((int)$websiteId);
+$website->delete();
 
 /**
  * reIndex all
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_duplicates.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_duplicates.php
index 8f35758df63..2873ae7ccf3 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_duplicates.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_duplicates.php
@@ -51,7 +51,7 @@
 )->setCateroryIds(
     []
 )->setStockData(
-    ['qty' => 100, 'is_in_stock' => 1]
+    ['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1]
 )->setCategoryIds(
     [444]
 )->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php
index 9dabda78530..38e8c404dc0 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual.php
@@ -20,5 +20,6 @@
         [
             'qty' => 100,
             'is_in_stock' => 1,
+            'manage_stock' => 1,
         ]
     )->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_in_stock.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_in_stock.php
index cd7aa7ce741..24f857bfa0d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_in_stock.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_virtual_in_stock.php
@@ -16,5 +16,5 @@
     ->setTaxClassId(0)
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-    ->setStockData(['is_in_stock' => 1, 'qty' => 10])
+    ->setStockData(['is_in_stock' => 1, 'qty' => 10, 'manage_stock' => 1])
     ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_dropdown_option.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_dropdown_option.php
index fa47cdefccc..a6fdcf92339 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_dropdown_option.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_dropdown_option.php
@@ -43,7 +43,8 @@
 )->setStockData(
     [
         'qty' => 0,
-        'is_in_stock' => 0
+        'is_in_stock' => 0,
+        'manage_stock' => 1,
     ]
 );
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_options.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_options.php
index 6c609a12f12..9b8a629d24c 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_options.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_with_options.php
@@ -36,7 +36,8 @@
 )->setStockData(
     [
         'qty' => 100,
-        'is_in_stock' => 1
+        'is_in_stock' => 1,
+        'manage_stock' => 1,
     ]
 )->setHasOptions(true);
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_crosssell.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_crosssell.php
index 93811a9a300..fb0f77038db 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_crosssell.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_crosssell.php
@@ -16,7 +16,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setStockData(['qty' => 100, 'is_in_stock' => 1])
+    ->setStockData(['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1])
     ->save();
 
 /** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
@@ -35,6 +35,6 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setStockData(['qty' => 100, 'is_in_stock' => 1])
+    ->setStockData(['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1])
     ->setProductLinks([$productLink])
     ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_category.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_category.php
index c6283f7c36a..f8999f3cb3d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_category.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_in_category.php
@@ -25,7 +25,7 @@
 )->setWebsiteIds(
     [1]
 )->setStockData(
-    ['qty' => 100, 'is_in_stock' => 1]
+    ['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1]
 )->save();
 
 $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
@@ -48,7 +48,7 @@
 )->setWebsiteIds(
     [1]
 )->setStockData(
-    ['qty' => 100, 'is_in_stock' => 1]
+    ['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1]
 )->save();
 
 /** @var \Magento\Catalog\Model\Category $category */
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new.php
index 15e274541ba..7d6e2e6f978 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new.php
@@ -14,7 +14,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setStockData(['qty' => 100, 'is_in_stock' => 1])
+    ->setStockData(['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1])
     ->setNewsFromDate(date('Y-m-d', strtotime('-2 day')))
     ->setNewsToDate(date('Y-m-d', strtotime('+2 day')))
     ->setDescription('description')
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_related.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_related.php
index 62221ea5d70..fc0d3b2aff1 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_related.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_related.php
@@ -16,7 +16,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setStockData(['qty' => 100, 'is_in_stock' => 1])
+    ->setStockData(['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1])
     ->save();
 
 /** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
@@ -35,6 +35,6 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setStockData(['qty' => 100, 'is_in_stock' => 1])
+    ->setStockData(['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1])
     ->setProductLinks([$productLink])
     ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_related_multiple.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_related_multiple.php
index 174150d37f3..12867cdfc23 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_related_multiple.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_related_multiple.php
@@ -25,7 +25,7 @@
 )->setWebsiteIds(
     [1]
 )->setStockData(
-    ['qty' => 100, 'is_in_stock' => 1]
+    ['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1]
 )->save();
 
 $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
@@ -48,7 +48,7 @@
 )->setWebsiteIds(
     [1]
 )->setStockData(
-    ['qty' => 100, 'is_in_stock' => 1]
+    ['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1]
 )->save();
 
 /** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
@@ -87,7 +87,7 @@
 )->setWebsiteIds(
     [1]
 )->setStockData(
-    ['qty' => 100, 'is_in_stock' => 1]
+    ['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1]
 )->setProductLinks(
     [$productLink1, $productLink2]
 )->save();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_rollback.php
index 6d09725e40e..af25ead3929 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_rollback.php
@@ -29,5 +29,10 @@
     //Product already removed
 }
 
+/** @var \Magento\CatalogInventory\Model\StockRegistryStorage $stockRegistryStorage */
+$stockRegistryStorage = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\CatalogInventory\Model\StockRegistryStorage::class);
+$stockRegistryStorage->clean();
+
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_upsell.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_upsell.php
index a104a57350e..8df969a3101 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_upsell.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_upsell.php
@@ -25,7 +25,7 @@
 )->setWebsiteIds(
     [1]
 )->setStockData(
-    ['qty' => 100, 'is_in_stock' => 1]
+    ['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1]
 )->save();
 
 /** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_unique_input_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_unique_input_attribute.php
index 77b0cd7d94b..64f9cdba7e7 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_unique_input_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_unique_input_attribute.php
@@ -17,6 +17,6 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setStockData(['qty' => 100, 'is_in_stock' => 1])
+    ->setStockData(['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1])
     ->setData($attribute->getAttributeCode(), 'unique value')
     ->save();
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php
index efbc8c36409..befb3ce5047 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/AbstractProductExportImportTestCase.php
@@ -50,7 +50,8 @@ abstract class AbstractProductExportImportTestCase extends \PHPUnit\Framework\Te
         'custom_design_from',
         'updated_in',
         'tax_class_id',
-        'description'
+        'description',
+        'is_salable', // stock indexation is not performed during import
     ];
 
     protected function setUp()
@@ -286,7 +287,6 @@ protected function executeImportReplaceTest($skus, $skippedAttributes, $usePagin
             'row_id',
             'entity_id',
             'tier_price',
-            'is_salable',
             'media_gallery'
         ];
         $skippedAttributes = array_merge($replacedAttributes, $skippedAttributes);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php
index 51578741725..89fb9952cc6 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data.php
@@ -80,7 +80,7 @@
 )->setWebsiteIds(
     [1]
 )->setStockData(
-    ['qty' => 100, 'is_in_stock' => 1]
+    ['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1]
 )->setCanSaveCustomOptions(
     true
 )->setCategoryIds(
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars.php
index 8c7e0ab1514..a2c2c1815a8 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_data_special_chars.php
@@ -30,7 +30,7 @@
     ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
     ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
-    ->setStockData(['qty' => 100, 'is_in_stock' => 1])
+    ->setStockData(['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1])
     ->setCanSaveCustomOptions(true)
     ->setCategoryIds([333, 3331]);
 
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_product_links_data.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_product_links_data.php
index 2f1f0a0b14f..330d9511dcd 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_product_links_data.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/product_export_with_product_links_data.php
@@ -37,7 +37,7 @@
 )->setCateroryIds(
     []
 )->setStockData(
-    ['qty' => 100, 'is_in_stock' => 1]
+    ['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1]
 )->setCanSaveCustomOptions(
     true
 )->setCategoryIds(
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Quote/Item/QuantityValidatorTest.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Quote/Item/QuantityValidatorTest.php
index 6d59a08912c..873c5db9ab7 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Quote/Item/QuantityValidatorTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/Quote/Item/QuantityValidatorTest.php
@@ -130,10 +130,31 @@ public function testQuoteWithOptionsWithErrors()
         $this->stockState->expects($this->any())->method('checkQtyIncrements')->willReturn($resultMock);
         $this->optionInitializer->expects($this->any())->method('initialize')->willReturn($resultMock);
         $resultMock->expects($this->any())->method('getHasError')->willReturn(true);
+        $this->setMockStockStateResultToQuoteItemOptions($quoteItem, $resultMock);
         $this->observer->execute($this->observerMock);
         $this->assertCount(2, $quoteItem->getErrorInfos(), 'Expected 2 errors in QuoteItem');
     }
 
+    /**
+     * Set mock of Stock State Result to Quote Item Options.
+     *
+     *
+     * @param \Magento\Quote\Model\Quote\Item $quoteItem
+     * @param \PHPUnit_Framework_MockObject_MockObject $resultMock
+     */
+    private function setMockStockStateResultToQuoteItemOptions($quoteItem, $resultMock)
+    {
+        if ($options = $quoteItem->getQtyOptions()) {
+            foreach ($options as $option) {
+                $option->setStockStateResult($resultMock);
+            }
+
+            return;
+        }
+
+        $this->fail('Test failed since Quote Item does not have Qty options.');
+    }
+
     /**
      * Gets \Magento\Quote\Model\Quote\Item from \Magento\Quote\Model\Quote by product id
      *
diff --git a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/StockItemDataChecker.php b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/StockItemDataChecker.php
index 9913fea7981..eabb26a87e3 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/StockItemDataChecker.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogInventory/Model/StockItemSave/StockItemDataChecker.php
@@ -11,7 +11,9 @@
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\CatalogInventory\Api\StockItemCriteriaInterfaceFactory;
 use Magento\CatalogInventory\Api\StockItemRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\EntityManager\HydratorInterface;
+use PHPUnit\Framework\Assert;
 
 class StockItemDataChecker
 {
@@ -40,30 +42,39 @@ class StockItemDataChecker
      */
     private $productFactory;
 
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
     /**
      * @param HydratorInterface $hydrator
      * @param StockItemRepositoryInterface $stockItemRepository
      * @param StockItemCriteriaInterfaceFactory $stockItemCriteriaFactory
      * @param ProductRepositoryInterface $productRepository
      * @param ProductInterfaceFactory $productFactory
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
      */
     public function __construct(
         HydratorInterface $hydrator,
         StockItemRepositoryInterface $stockItemRepository,
         StockItemCriteriaInterfaceFactory $stockItemCriteriaFactory,
         ProductRepositoryInterface $productRepository,
-        ProductInterfaceFactory $productFactory
+        ProductInterfaceFactory $productFactory,
+        SearchCriteriaBuilder $searchCriteriaBuilder
     ) {
         $this->hydrator = $hydrator;
         $this->stockItemRepository = $stockItemRepository;
         $this->stockItemCriteriaFactory = $stockItemCriteriaFactory;
         $this->productRepository = $productRepository;
         $this->productFactory = $productFactory;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
     }
 
     /**
-     * @param string $sku
+     * @param $sku
      * @param array $expectedData
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function checkStockItemData($sku, array $expectedData)
     {
@@ -97,10 +108,10 @@ private function doCheckStockItemData(Product $product, array $expectedData)
             StockItemInterface::IS_IN_STOCK => 0,
             StockItemInterface::QTY => 0,
         ]);
-        \PHPUnit\Framework\Assert::assertNotNull($product->getQuantityAndStockStatus());
+        Assert::assertNotNull($product->getQuantityAndStockStatus());
         $this->assertArrayContains($expectedQuantityAndStockStatusData, $product->getQuantityAndStockStatus());
 
-        \PHPUnit\Framework\Assert::assertNotNull($product->getData('quantity_and_stock_status'));
+        Assert::assertNotNull($product->getData('quantity_and_stock_status'));
         $this->assertArrayContains($expectedQuantityAndStockStatusData, $product->getData('quantity_and_stock_status'));
     }
 
@@ -112,7 +123,7 @@ private function doCheckStockItemData(Product $product, array $expectedData)
     private function assertArrayContains(array $expected, array $actual)
     {
         foreach ($expected as $key => $value) {
-            \PHPUnit\Framework\Assert::assertArrayHasKey(
+            Assert::assertArrayHasKey(
                 $key,
                 $actual,
                 "Expected value for key '{$key}' is missed"
@@ -120,7 +131,7 @@ private function assertArrayContains(array $expected, array $actual)
             if (is_array($value)) {
                 $this->assertArrayContains($value, $actual[$key]);
             } else {
-                \PHPUnit\Framework\Assert::assertEquals(
+                Assert::assertEquals(
                     $value,
                     $actual[$key],
                     "Expected value for key '{$key}' doesn't match"
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProviderTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProviderTest.php
new file mode 100644
index 00000000000..4d2a90f8f44
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProviderTest.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogSearch\Model\Indexer\Fulltext\Action;
+
+class DataProviderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @magentoDataFixture Magento/CatalogSearch/_files/product_for_search.php
+     * @magentoDbIsolation disabled
+     */
+    public function testSearchProductByAttribute()
+    {
+        /** @var $objectManager \Magento\TestFramework\ObjectManager */
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $config = $objectManager->create(\Magento\Framework\Search\Request\Config::class);
+        /** @var \Magento\Framework\Search\Request\Builder $requestBuilder */
+        $requestBuilder = $objectManager->create(
+            \Magento\Framework\Search\Request\Builder::class,
+            ['config' => $config]
+        );
+        $requestBuilder->bind('search_term', 'VALUE1');
+        $requestBuilder->setRequestName('quick_search_container');
+        $queryRequest = $requestBuilder->create();
+        /** @var \Magento\Framework\Search\Adapter\Mysql\Adapter $adapter */
+        $adapter = $objectManager->create(\Magento\Framework\Search\Adapter\Mysql\Adapter::class);
+        $queryResponse = $adapter->query($queryRequest);
+        $actualIds = [];
+        foreach ($queryResponse as $document) {
+            /** @var \Magento\Framework\Api\Search\Document $document */
+            $actualIds[] = $document->getId();
+        }
+
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $objectManager->create(\Magento\Catalog\Model\ProductRepository::class)->get('simple');
+        $this->assertContains($product->getId(), $actualIds, 'Product not found by searchable attribute.');
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php
index 29d1547f2d8..7e93a2968cd 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/FulltextTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\CatalogSearch\Model\Indexer;
 
 use Magento\Catalog\Model\Product;
@@ -25,11 +27,6 @@ class FulltextTest extends \PHPUnit\Framework\TestCase
      */
     protected $engine;
 
-    /**
-     * @var \Magento\CatalogSearch\Model\ResourceModel\Fulltext
-     */
-    protected $resourceFulltext;
-
     /**
      * @var \Magento\CatalogSearch\Model\Fulltext
      */
@@ -82,10 +79,6 @@ protected function setUp()
             \Magento\CatalogSearch\Model\ResourceModel\Engine::class
         );
 
-        $this->resourceFulltext = Bootstrap::getObjectManager()->get(
-            \Magento\CatalogSearch\Model\ResourceModel\Fulltext::class
-        );
-
         $this->queryFactory = Bootstrap::getObjectManager()->get(
             \Magento\Search\Model\QueryFactory::class
         );
@@ -192,9 +185,8 @@ public function testReindexRowAfterDelete()
      * @param string $text
      * @return Product[]
      */
-    protected function search($text)
+    protected function search($text): array
     {
-        $this->resourceFulltext->resetSearchResults();
         $query = $this->queryFactory->get();
         $query->unsetData();
         $query->setQueryText($text);
@@ -219,7 +211,7 @@ protected function search($text)
      * @param string $sku
      * @return Product
      */
-    protected function getProductBySku($sku)
+    protected function getProductBySku($sku): Product
     {
         /** @var Product $product */
         $product = Bootstrap::getObjectManager()->get(
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/SwitcherUsedInFulltextTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/SwitcherUsedInFulltextTest.php
index c7b22716757..127b4ec675c 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/SwitcherUsedInFulltextTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/SwitcherUsedInFulltextTest.php
@@ -6,8 +6,6 @@
 namespace Magento\CatalogSearch\Model\Indexer;
 
 use Magento\Catalog\Model\Product;
-use Magento\CatalogSearch\Model\Indexer\Fulltext;
-use Magento\CatalogSearch\Model\Indexer\IndexSwitcherMock;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection;
 use Magento\TestFramework\Helper\Bootstrap;
 
@@ -33,11 +31,6 @@ class SwitcherUsedInFulltextTest extends \PHPUnit\Framework\TestCase
      */
     protected $engine;
 
-    /**
-     * @var \Magento\CatalogSearch\Model\ResourceModel\Fulltext
-     */
-    protected $resourceFulltext;
-
     /**
      * @var \Magento\CatalogSearch\Model\Fulltext
      */
@@ -104,10 +97,6 @@ protected function setUp()
             \Magento\CatalogSearch\Model\ResourceModel\Engine::class
         );
 
-        $this->resourceFulltext = $objectManager->get(
-            \Magento\CatalogSearch\Model\ResourceModel\Fulltext::class
-        );
-
         $this->queryFactory = $objectManager->get(
             \Magento\Search\Model\QueryFactory::class
         );
@@ -178,7 +167,6 @@ public function testReindexRow()
      */
     protected function search($text)
     {
-        $this->resourceFulltext->resetSearchResults();
         $query = $this->queryFactory->get();
         $query->unsetData();
         $query->setQueryText($text);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search.php
new file mode 100644
index 00000000000..afeb250a592
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+require 'searchable_attribute.php';
+require __DIR__ . '/../../../Magento/Catalog/_files/product_simple.php';
+
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Store\Model\StoreManager $storeManager */
+$storeManager = $objectManager->get(\Magento\Store\Model\StoreManager::class);
+$storeManager->setIsSingleStoreModeAllowed(false);
+/** @var \Magento\Store\Model\Store $store */
+$store = $storeManager->getStore('default');
+
+/** @var \Magento\Catalog\Model\Product $product */
+$product = $objectManager->create(\Magento\Catalog\Model\ProductRepository::class)->get('simple');
+/** @var \Magento\Catalog\Model\Product\Action $productAction */
+$productAction = $objectManager->create(\Magento\Catalog\Model\Product\Action::class);
+$productAction->updateAttributes([$product->getId()], ['test_searchable_attribute' => 'VALUE1'], $store->getId());
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_rollback.php
new file mode 100644
index 00000000000..00e2096ca73
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_rollback.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Model\Product $product */
+$product = $objectManager->create(\Magento\Catalog\Model\ProductRepository::class)->get('simple');
+/** @var \Magento\Catalog\Model\ResourceModel\Product $productResource */
+$productResource = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Product::class);
+$productResource->delete($product);
+
+$eavSetupFactory = $objectManager->create(\Magento\Eav\Setup\EavSetupFactory::class);
+/** @var \Magento\Eav\Setup\EavSetup $eavSetup */
+$eavSetup = $eavSetupFactory->create();
+$eavSetup->removeAttribute(\Magento\Catalog\Model\Product::ENTITY, 'test_searchable_attribute');
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/searchable_attribute.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/searchable_attribute.php
new file mode 100644
index 00000000000..b25d39b1d40
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/searchable_attribute.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$eavSetupFactory = $objectManager->create(\Magento\Eav\Setup\EavSetupFactory::class);
+/** @var \Magento\Eav\Setup\EavSetup $eavSetup */
+$eavSetup = $eavSetupFactory->create();
+$eavSetup->addAttribute(
+    \Magento\Catalog\Model\Product::ENTITY,
+    'test_searchable_attribute',
+    [
+        'label' => 'Test-attribute',
+        'global' => \Magento\Catalog\Model\ResourceModel\Eav\Attribute::SCOPE_STORE,
+        'required' => 0,
+        'user_defined' => 1,
+        'searchable' => 1,
+        'visible_on_front' => 1,
+        'filterable_in_search' => 1,
+        'used_in_product_listing' => 1,
+        'is_used_in_grid' => 1,
+        'is_filterable_in_grid' => 1,
+    ]
+);
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php
index 2036042d046..07141843793 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/Index/CouponPostTest.php
@@ -32,7 +32,7 @@ public function testExecute()
         );
 
         $this->assertSessionMessages(
-            $this->equalTo(['The coupon code "test" is not valid.']),
+            $this->equalTo(['The coupon code &quot;test&quot; is not valid.']),
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_product_and_payment_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_product_and_payment_rollback.php
new file mode 100644
index 00000000000..5f3b024c314
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_product_and_payment_rollback.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+require __DIR__ . '/../../../Magento/Catalog/_files/products_rollback.php';
+require __DIR__ . '/rollback_quote.php';
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php
index f9776b2264f..4e0b74ba0f9 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Controller/CartTest.php
@@ -91,7 +91,7 @@ public function testExecuteForConfigurableLastOption()
         );
 
         $this->assertSessionMessages(
-            $this->equalTo(['The coupon code "test" is not valid.']),
+            $this->equalTo(['The coupon code &quot;test&quot; is not valid.']),
             \Magento\Framework\Message\MessageInterface::TYPE_ERROR
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/quote_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/quote_rollback.php
new file mode 100644
index 00000000000..a357fd3005b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/quote_rollback.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+include __DIR__ . '/../../../Magento/Sales/_files/quote_rollback.php';
diff --git a/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom1/etc/view.xml b/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom1/etc/view.xml
index 17026f9ce77..37a45fbbfe4 100644
--- a/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom1/etc/view.xml
+++ b/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom1/etc/view.xml
@@ -12,7 +12,6 @@
     <exclude>
         <item type="file">Lib::jquery/jquery.min.js</item>
         <item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
-        <item type="file">Lib::jquery/jquery.ba-hashchange.min.js</item>
         <item type="file">Lib::jquery/jquery.details.js</item>
         <item type="file">Lib::jquery/jquery.details.min.js</item>
         <item type="file">Lib::jquery/jquery.hoverIntent.js</item>
diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php
index d75f49995f4..b65aa7734f2 100644
--- a/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php
@@ -133,7 +133,7 @@ public function getPostcodesDataProvider()
             ['countryId' => 'IL', 'postcode' => '12345'],
             ['countryId' => 'IT', 'postcode' => '12345'],
             ['countryId' => 'JP', 'postcode' => '123-4567'],
-            ['countryId' => 'JP', 'postcode' => '123'],
+            ['countryId' => 'JP', 'postcode' => '1234567'],
             ['countryId' => 'JE', 'postcode' => 'TY8 9PL'],
             ['countryId' => 'KZ', 'postcode' => '123456'],
             ['countryId' => 'KE', 'postcode' => '12345'],
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable.php
index ccc607080aa..19cf449912b 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/product_downloadable.php
@@ -22,6 +22,7 @@
         [
             'qty' => 100,
             'is_in_stock' => 1,
+            'manage_stock' => 1,
         ]
     );
 
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/ConfigTest.php
index 228ee9d79d9..ac86ddde540 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/ConfigTest.php
@@ -13,6 +13,9 @@
  */
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {
+    /**
+     * @magentoAppIsolation enabled
+     */
     public function testGetConsumers()
     {
         $consumers = $this->getConfigData()->getConsumers();
@@ -20,6 +23,9 @@ public function testGetConsumers()
         $this->assertEquals($expectedParsedConfig['consumers'], $consumers);
     }
 
+    /**
+     * @magentoAppIsolation enabled
+     */
     public function testGetPublishers()
     {
         $publishers = $this->getConfigData()->getPublishers();
@@ -27,6 +33,9 @@ public function testGetPublishers()
         $this->assertEquals($expectedParsedConfig['publishers'], $publishers);
     }
 
+    /**
+     * @magentoAppIsolation enabled
+     */
     public function testGetBinds()
     {
         $binds = $this->getConfigData()->getBinds();
@@ -34,6 +43,9 @@ public function testGetBinds()
         $this->assertEquals($expectedParsedConfig['binds'], $binds);
     }
 
+    /**
+     * @magentoAppIsolation enabled
+     */
     public function testGetMaps()
     {
         $topicName = 'topic.broker.test';
@@ -45,6 +57,9 @@ public function testGetMaps()
         );
     }
 
+    /**
+     * @magentoAppIsolation enabled
+     */
     public function testGetTopic()
     {
         $topicName = 'topic.broker.test';
@@ -155,7 +170,7 @@ protected function getConfigInstance($configFilePath, $envConfigFilePath = null)
             ]
         );
         return $objectManager->create(
-            \Magento\Framework\MessageQueue\ConfigInterface::class,
+            \Magento\Framework\MessageQueue\Config::class,
             ['queueConfigData' => $configData]
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/QueueTestCaseAbstract.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/QueueTestCaseAbstract.php
index 65f7c568159..bda232c7fb9 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/QueueTestCaseAbstract.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/UseCase/QueueTestCaseAbstract.php
@@ -8,11 +8,14 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Framework\MessageQueue\PublisherInterface;
+use Magento\TestFramework\MessageQueue\PublisherConsumerController;
+use Magento\TestFramework\MessageQueue\EnvironmentPreconditionException;
+use Magento\TestFramework\MessageQueue\PreconditionFailedException;
 
 /**
  * Base test case for message queue tests.
  */
-abstract class QueueTestCaseAbstract extends \PHPUnit\Framework\TestCase
+class QueueTestCaseAbstract extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var string[]
@@ -39,80 +42,37 @@ abstract class QueueTestCaseAbstract extends \PHPUnit\Framework\TestCase
      */
     protected $maxMessages = null;
 
+    /**
+     * @var PublisherConsumerController
+     */
+    private $publisherConsumerController;
+
     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->publisherConsumerController = $this->objectManager->create(PublisherConsumerController::class, [
+            'consumers' => $this->consumers,
+            'logFilePath' => $this->logFilePath,
+            'maxMessages' => $this->maxMessages,
+            'appInitParams' => \Magento\TestFramework\Helper\Bootstrap::getInstance()->getAppInitParams()
+        ]);
+
+        try {
+            $this->publisherConsumerController->initialize();
+        } catch (EnvironmentPreconditionException $e) {
+            $this->markTestSkipped($e->getMessage());
+        } catch (PreconditionFailedException $e) {
+            $this->fail(
+                $e->getMessage()
+            );
         }
-
-        $this->publisher = $this->objectManager->get(PublisherInterface::class);
+        $this->publisher = $this->publisherConsumerController->getPublisher();
     }
 
     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;
+        $this->publisherConsumerController->stopConsumers();
     }
 
     /**
@@ -123,17 +83,22 @@ protected function getConsumerStartCommand($consumer, $withEnvVariables = false)
      */
     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.");
+        try {
+            //$expectedLinesCount, $logFilePath
+            $this->publisherConsumerController->waitForAsynchronousResult([$this, 'checkLogsExists'], [
+                $expectedLinesCount, $logFilePath
+            ]);
+        } catch (PreconditionFailedException $e) {
+            $this->fail($e->getMessage());
         }
     }
 
+    public function checkLogsExists($expectedLinesCount)
+    {
+        $actualCount = file_exists($this->logFilePath) ? count(file($this->logFilePath)) : 0;
+        return $expectedLinesCount === $actualCount;
+    }
+
     /**
      * Workaround for https://bugs.php.net/bug.php?id=72286
      */
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/products_rollback.php b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/products_rollback.php
index af3dbd12144..106bb5ad434 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Search/_files/products_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Search/_files/products_rollback.php
@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+use Magento\CatalogInventory\Model\StockRegistryStorage;
+
 /** @var \Magento\Framework\Registry $registry */
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 $registry = $objectManager->get(\Magento\Framework\Registry::class);
@@ -17,5 +20,9 @@
     $collection->delete();
 }
 
+/** @var \Magento\CatalogInventory\Model\StockRegistryStorage $stockRegistryStorage */
+$stockRegistryStorage = $objectManager->get(\Magento\CatalogInventory\Model\StockRegistryStorage::class);
+$stockRegistryStorage->clean();
+
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php
index 573531cff96..3e90aa67f46 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php
@@ -3,314 +3,377 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Framework\Session;
-
-use Magento\Framework\App\Filesystem\DirectoryList;
-
-/**
- * @magentoAppIsolation enabled
- */
-class ConfigTest extends \PHPUnit\Framework\TestCase
-{
-    /** @var \Magento\Framework\Session\Config */
-    protected $_model;
-
-    /** @var string */
-    protected $_cacheLimiter = 'private_no_expire';
+// @codingStandardsIgnoreStart
+namespace {
+    $mockPHPFunctions = false;
+}
 
-    /** @var \Magento\TestFramework\ObjectManager */
-    protected $_objectManager;
+namespace Magento\Framework\Session {
 
-    /** @var string Default value for session.save_path setting */
-    protected $defaultSavePath;
+    use Magento\Framework\App\Filesystem\DirectoryList;
 
-    /** @var \Magento\Framework\App\DeploymentConfig | \PHPUnit_Framework_MockObject_MockObject */
-    protected $deploymentConfigMock;
+    // @codingStandardsIgnoreEnd
 
-    protected function setUp()
+    /**
+     * Mock ini_get global function
+     *
+     * @return string
+     */
+    function ini_get($varName)
     {
-        $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /** @var $sessionManager \Magento\Framework\Session\SessionManager */
-        $sessionManager = $this->_objectManager->create(\Magento\Framework\Session\SessionManager::class);
-        if ($sessionManager->isSessionExists()) {
-            $sessionManager->writeClose();
+        global $mockPHPFunctions;
+        if ($mockPHPFunctions == 1) {
+            switch ($varName) {
+                case 'session.save_path':
+                    return 'preset_save_path';
+                case 'session.save_handler':
+                    return 'php';
+                default:
+                    return '';
+            }
+        } elseif ($mockPHPFunctions == 2) {
+            return null;
         }
-        $this->deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
-        $this->deploymentConfigMock
-            ->method('get')
-            ->willReturnCallback(function ($configPath) {
-                switch ($configPath) {
-                    case Config::PARAM_SESSION_SAVE_METHOD:
-                        return 'files';
-                    case Config::PARAM_SESSION_CACHE_LIMITER:
-                        return $this->_cacheLimiter;
-                    default:
-                        return null;
-                }
-            });
-
-        $this->_model = $this->_objectManager->create(
-            \Magento\Framework\Session\Config::class,
-            ['deploymentConfig' => $this->deploymentConfigMock]
-        );
-        $this->defaultSavePath = $this->_objectManager
-            ->get(\Magento\Framework\Filesystem\DirectoryList::class)
-            ->getPath(DirectoryList::SESSION);
+        return call_user_func_array('\ini_get', func_get_args());
     }
 
     /**
      * @magentoAppIsolation enabled
      */
-    public function testDefaultConfiguration()
+    class ConfigTest extends \PHPUnit\Framework\TestCase
     {
-        /** @var \Magento\Framework\Filesystem $filesystem */
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Framework\Filesystem::class
-        );
-        $path = ini_get('session.save_path') ?:
-            $filesystem->getDirectoryRead(DirectoryList::SESSION)->getAbsolutePath();
-
-        $this->assertEquals(
-            $path,
-            $this->_model->getSavePath()
-        );
-        $this->assertEquals(
-            \Magento\Framework\Session\Config::COOKIE_LIFETIME_DEFAULT,
-            $this->_model->getCookieLifetime()
-        );
-        $this->assertEquals($this->_cacheLimiter, $this->_model->getCacheLimiter());
-        $this->assertEquals('/', $this->_model->getCookiePath());
-        $this->assertEquals('localhost', $this->_model->getCookieDomain());
-        $this->assertEquals(false, $this->_model->getCookieSecure());
-        $this->assertEquals(true, $this->_model->getCookieHttpOnly());
-        $this->assertEquals($this->_model->getSavePath(), $this->_model->getOption('save_path'));
-    }
+        /** @var string */
+        private $_cacheLimiter = 'private_no_expire';
+
+        /** @var \Magento\TestFramework\ObjectManager */
+        private $_objectManager;
+
+        /** @var string Default value for session.save_path setting */
+        private $defaultSavePath;
+
+        /** @var \Magento\Framework\App\DeploymentConfig | \PHPUnit_Framework_MockObject_MockObject */
+        private $deploymentConfigMock;
+
+        protected function setUp()
+        {
+            $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+            $this->deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
+            $this->deploymentConfigMock
+                ->method('get')
+                ->willReturnCallback(function ($configPath) {
+                    switch ($configPath) {
+                        case Config::PARAM_SESSION_SAVE_METHOD:
+                            return 'files';
+                        case Config::PARAM_SESSION_CACHE_LIMITER:
+                            return $this->_cacheLimiter;
+                        default:
+                            return null;
+                    }
+                });
+
+            $this->defaultSavePath = $this->_objectManager
+                ->get(\Magento\Framework\Filesystem\DirectoryList::class)
+                ->getPath(DirectoryList::SESSION);
+        }
 
-    public function testSetOptionsInvalidValue()
-    {
-        $preValue = $this->_model->getOptions();
-        $this->_model->setOptions('');
-        $this->assertEquals($preValue, $this->_model->getOptions());
-    }
+        /**
+         * @magentoAppIsolation enabled
+         */
+        public function testDefaultConfiguration()
+        {
+            $model = $this->getModel();
+            /** @var \Magento\Framework\Filesystem $filesystem */
+            $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+                \Magento\Framework\Filesystem::class
+            );
+            $path = ini_get('session.save_path') ?:
+                $filesystem->getDirectoryRead(DirectoryList::SESSION)->getAbsolutePath();
+
+            $this->assertEquals(
+                $path,
+                $model->getSavePath()
+            );
+            $this->assertEquals(
+                \Magento\Framework\Session\Config::COOKIE_LIFETIME_DEFAULT,
+                $model->getCookieLifetime()
+            );
+            $this->assertEquals($this->_cacheLimiter, $model->getCacheLimiter());
+            $this->assertEquals('/', $model->getCookiePath());
+            $this->assertEquals('localhost', $model->getCookieDomain());
+            $this->assertEquals(false, $model->getCookieSecure());
+            $this->assertEquals(true, $model->getCookieHttpOnly());
+            $this->assertEquals($model->getSavePath(), $model->getOption('save_path'));
+        }
 
-    /**
-     * @dataProvider optionsProvider
-     */
-    public function testSetOptions($option, $getter, $value)
-    {
-        $options = [$option => $value];
-        $this->_model->setOptions($options);
-        $this->assertSame($value, $this->_model->{$getter}());
-    }
+        public function testSetOptionsInvalidValue()
+        {
+            $model = $this->getModel();
+            $preValue = $model->getOptions();
+            $model->setOptions('');
+            $this->assertEquals($preValue, $model->getOptions());
+        }
 
-    public function optionsProvider()
-    {
-        return [
-            ['save_path', 'getSavePath', __DIR__],
-            ['name', 'getName', 'FOOBAR'],
-            ['gc_probability', 'getGcProbability', 42],
-            ['gc_divisor', 'getGcDivisor', 3],
-            ['gc_maxlifetime', 'getGcMaxlifetime', 180],
-            ['serialize_handler', 'getSerializeHandler', 'php_binary'],
-            ['cookie_lifetime', 'getCookieLifetime', 180],
-            ['cookie_path', 'getCookiePath', '/foo/bar'],
-            ['cookie_domain', 'getCookieDomain', 'framework.zend.com'],
-            ['cookie_secure', 'getCookieSecure', true],
-            ['cookie_httponly', 'getCookieHttpOnly', true],
-            ['use_cookies', 'getUseCookies', false],
-            ['use_only_cookies', 'getUseOnlyCookies', true],
-            ['referer_check', 'getRefererCheck', 'foobar'],
-            ['entropy_file', 'getEntropyFile', __FILE__],
-            ['entropy_length', 'getEntropyLength', 42],
-            ['cache_limiter', 'getCacheLimiter', 'private'],
-            ['cache_expire', 'getCacheExpire', 42],
-            ['use_trans_sid', 'getUseTransSid', true],
-            ['hash_function', 'getHashFunction', 'md5'],
-            ['hash_bits_per_character', 'getHashBitsPerCharacter', 5],
-            ['url_rewriter_tags', 'getUrlRewriterTags', 'a=href']
-        ];
-    }
+        /**
+         * @dataProvider optionsProvider
+         */
+        public function testSetOptions($option, $getter, $value)
+        {
+            $model = $this->getModel();
+            $options = [$option => $value];
+            $model->setOptions($options);
+            $this->assertSame($value, $model->{$getter}());
+        }
 
-    public function testNameIsMutable()
-    {
-        $this->_model->setName('FOOBAR');
-        $this->assertEquals('FOOBAR', $this->_model->getName());
-    }
+        public function optionsProvider()
+        {
+            return [
+                ['save_path', 'getSavePath', __DIR__],
+                ['name', 'getName', 'FOOBAR'],
+                ['gc_probability', 'getGcProbability', 42],
+                ['gc_divisor', 'getGcDivisor', 3],
+                ['gc_maxlifetime', 'getGcMaxlifetime', 180],
+                ['serialize_handler', 'getSerializeHandler', 'php_binary'],
+                ['cookie_lifetime', 'getCookieLifetime', 180],
+                ['cookie_path', 'getCookiePath', '/foo/bar'],
+                ['cookie_domain', 'getCookieDomain', 'framework.zend.com'],
+                ['cookie_secure', 'getCookieSecure', true],
+                ['cookie_httponly', 'getCookieHttpOnly', true],
+                ['use_cookies', 'getUseCookies', false],
+                ['use_only_cookies', 'getUseOnlyCookies', true],
+                ['referer_check', 'getRefererCheck', 'foobar'],
+                ['entropy_file', 'getEntropyFile', __FILE__],
+                ['entropy_length', 'getEntropyLength', 42],
+                ['cache_limiter', 'getCacheLimiter', 'private'],
+                ['cache_expire', 'getCacheExpire', 42],
+                ['use_trans_sid', 'getUseTransSid', true],
+                ['hash_function', 'getHashFunction', 'md5'],
+                ['hash_bits_per_character', 'getHashBitsPerCharacter', 5],
+                ['url_rewriter_tags', 'getUrlRewriterTags', 'a=href']
+            ];
+        }
 
-    public function testCookieLifetimeIsMutable()
-    {
-        $this->_model->setCookieLifetime(20);
-        $this->assertEquals(20, $this->_model->getCookieLifetime());
-    }
+        public function testNameIsMutable()
+        {
+            $model = $this->getModel();
+            $model->setName('FOOBAR');
+            $this->assertEquals('FOOBAR', $model->getName());
+        }
 
-    public function testCookieLifetimeCanBeZero()
-    {
-        $this->_model->setCookieLifetime(0);
-        $this->assertEquals(0, $this->_model->getCookieLifetime());
-    }
+        public function testCookieLifetimeIsMutable()
+        {
+            $model = $this->getModel();
+            $model->setCookieLifetime(20);
+            $this->assertEquals(20, $model->getCookieLifetime());
+        }
 
-    public function testSettingInvalidCookieLifetime()
-    {
-        $preVal = $this->_model->getCookieLifetime();
-        $this->_model->setCookieLifetime('foobar_bogus');
-        $this->assertEquals($preVal, $this->_model->getCookieLifetime());
-    }
+        public function testCookieLifetimeCanBeZero()
+        {
+            $model = $this->getModel();
+            $model->setCookieLifetime(0);
+            $this->assertEquals(0, $model->getCookieLifetime());
+        }
 
-    public function testSettingInvalidCookieLifetime2()
-    {
-        $preVal = $this->_model->getCookieLifetime();
-        $this->_model->setCookieLifetime(-1);
-        $this->assertEquals($preVal, $this->_model->getCookieLifetime());
-    }
+        public function testSettingInvalidCookieLifetime()
+        {
+            $model = $this->getModel();
+            $preVal = $model->getCookieLifetime();
+            $model->setCookieLifetime('foobar_bogus');
+            $this->assertEquals($preVal, $model->getCookieLifetime());
+        }
 
-    public function testWrongMethodCall()
-    {
-        $this->expectException(
-            '\BadMethodCallException',
-            'Method "methodThatNotExist" does not exist in Magento\Framework\Session\Config'
-        );
-        $this->_model->methodThatNotExist();
-    }
+        public function testSettingInvalidCookieLifetime2()
+        {
+            $model = $this->getModel();
+            $preVal = $model->getCookieLifetime();
+            $model->setCookieLifetime(-1);
+            $this->assertEquals($preVal, $model->getCookieLifetime());
+        }
 
-    public function testCookieSecureDefaultsToIniSettings()
-    {
-        $this->assertSame((bool)ini_get('session.cookie_secure'), $this->_model->getCookieSecure());
-    }
+        public function testWrongMethodCall()
+        {
+            $model = $this->getModel();
+            $this->expectException(
+                '\BadMethodCallException',
+                'Method "methodThatNotExist" does not exist in Magento\Framework\Session\Config'
+            );
+            $model->methodThatNotExist();
+        }
 
-    public function testSetCookieSecureInOptions()
-    {
-        $this->_model->setCookieSecure(true);
-        $this->assertTrue($this->_model->getCookieSecure());
-    }
+        public function testCookieSecureDefaultsToIniSettings()
+        {
+            $model = $this->getModel();
+            $this->assertSame((bool)ini_get('session.cookie_secure'), $model->getCookieSecure());
+        }
 
-    public function testCookieDomainIsMutable()
-    {
-        $this->_model->setCookieDomain('example.com');
-        $this->assertEquals('example.com', $this->_model->getCookieDomain());
-    }
+        public function testSetCookieSecureInOptions()
+        {
+            $model = $this->getModel();
+            $model->setCookieSecure(true);
+            $this->assertTrue($model->getCookieSecure());
+        }
 
-    public function testCookieDomainCanBeEmpty()
-    {
-        $this->_model->setCookieDomain('');
-        $this->assertEquals('', $this->_model->getCookieDomain());
-    }
+        public function testCookieDomainIsMutable()
+        {
+            $model = $this->getModel();
+            $model->setCookieDomain('example.com');
+            $this->assertEquals('example.com', $model->getCookieDomain());
+        }
 
-    public function testSettingInvalidCookieDomain()
-    {
-        $preVal = $this->_model->getCookieDomain();
-        $this->_model->setCookieDomain(24);
-        $this->assertEquals($preVal, $this->_model->getCookieDomain());
-    }
+        public function testCookieDomainCanBeEmpty()
+        {
+            $model = $this->getModel();
+            $model->setCookieDomain('');
+            $this->assertEquals('', $model->getCookieDomain());
+        }
 
-    public function testSettingInvalidCookieDomain2()
-    {
-        $preVal = $this->_model->getCookieDomain();
-        $this->_model->setCookieDomain('D:\\WINDOWS\\System32\\drivers\\etc\\hosts');
-        $this->assertEquals($preVal, $this->_model->getCookieDomain());
-    }
+        public function testSettingInvalidCookieDomain()
+        {
+            $model = $this->getModel();
+            $preVal = $model->getCookieDomain();
+            $model->setCookieDomain(24);
+            $this->assertEquals($preVal, $model->getCookieDomain());
+        }
 
-    public function testSetCookieHttpOnlyInOptions()
-    {
-        $this->_model->setCookieHttpOnly(true);
-        $this->assertTrue($this->_model->getCookieHttpOnly());
-    }
+        public function testSettingInvalidCookieDomain2()
+        {
+            $model = $this->getModel();
+            $preVal = $model->getCookieDomain();
+            $model->setCookieDomain('D:\\WINDOWS\\System32\\drivers\\etc\\hosts');
+            $this->assertEquals($preVal, $model->getCookieDomain());
+        }
 
-    public function testUseCookiesDefaultsToIniSettings()
-    {
-        $this->assertSame((bool)ini_get('session.use_cookies'), $this->_model->getUseCookies());
-    }
+        public function testSetCookieHttpOnlyInOptions()
+        {
+            $model = $this->getModel();
+            $model->setCookieHttpOnly(true);
+            $this->assertTrue($model->getCookieHttpOnly());
+        }
 
-    public function testSetUseCookiesInOptions()
-    {
-        $this->_model->setUseCookies(true);
-        $this->assertTrue($this->_model->getUseCookies());
-    }
+        public function testUseCookiesDefaultsToIniSettings()
+        {
+            $model = $this->getModel();
+            $this->assertSame((bool)ini_get('session.use_cookies'), $model->getUseCookies());
+        }
 
-    public function testUseOnlyCookiesDefaultsToIniSettings()
-    {
-        $this->assertSame((bool)ini_get('session.use_only_cookies'), $this->_model->getUseOnlyCookies());
-    }
+        public function testSetUseCookiesInOptions()
+        {
+            $model = $this->getModel();
+            $model->setUseCookies(true);
+            $this->assertTrue($model->getUseCookies());
+        }
 
-    public function testSetUseOnlyCookiesInOptions()
-    {
-        $this->_model->setOption('use_only_cookies', true);
-        $this->assertTrue((bool)$this->_model->getOption('use_only_cookies'));
-    }
+        public function testUseOnlyCookiesDefaultsToIniSettings()
+        {
+            $model = $this->getModel();
+            $this->assertSame((bool)ini_get('session.use_only_cookies'), $model->getUseOnlyCookies());
+        }
 
-    public function testRefererCheckDefaultsToIniSettings()
-    {
-        $this->assertSame(ini_get('session.referer_check'), $this->_model->getRefererCheck());
-    }
+        public function testSetUseOnlyCookiesInOptions()
+        {
+            $model = $this->getModel();
+            $model->setOption('use_only_cookies', true);
+            $this->assertTrue((bool)$model->getOption('use_only_cookies'));
+        }
 
-    public function testRefererCheckIsMutable()
-    {
-        $this->_model->setOption('referer_check', 'FOOBAR');
-        $this->assertEquals('FOOBAR', $this->_model->getOption('referer_check'));
-    }
+        public function testRefererCheckDefaultsToIniSettings()
+        {
+            $model = $this->getModel();
+            $this->assertSame(ini_get('session.referer_check'), $model->getRefererCheck());
+        }
 
-    public function testRefererCheckMayBeEmpty()
-    {
-        $this->_model->setOption('referer_check', '');
-        $this->assertEquals('', $this->_model->getOption('referer_check'));
-    }
+        public function testRefererCheckIsMutable()
+        {
+            $model = $this->getModel();
+            $model->setOption('referer_check', 'FOOBAR');
+            $this->assertEquals('FOOBAR', $model->getOption('referer_check'));
+        }
 
-    public function testSetSavePath()
-    {
-        $this->_model->setSavePath('some_save_path');
-        $this->assertEquals($this->_model->getOption('save_path'), 'some_save_path');
-    }
+        public function testRefererCheckMayBeEmpty()
+        {
+            $model = $this->getModel();
+            $model->setOption('referer_check', '');
+            $this->assertEquals('', $model->getOption('referer_check'));
+        }
 
-    /**
-     * @dataProvider savePathDataProvider
-     */
-    public function testConstructorSavePath($existing, $given, $expected)
-    {
-        $sessionSavePath = ini_get('session.save_path');
-        if ($expected === 'default') {
-            $expected = $this->defaultSavePath . '/';
+        public function testSetSavePath()
+        {
+            $model = $this->getModel();
+            $model->setSavePath('some_save_path');
+            $this->assertEquals($model->getOption('save_path'), 'some_save_path');
         }
-        $setup = ini_set('session.save_path', $existing);
-        if ($setup === false) {
-            $this->markTestSkipped('Cannot set session.save_path with ini_set');
+
+        /**
+         * @param $mockPHPFunctionNum
+         * @param $givenSavePath
+         * @param $expectedSavePath
+         * @param $givenSaveHandler
+         * @param $expectedSaveHandler
+         * @dataProvider constructorDataProvider
+         */
+        public function testConstructor(
+            $mockPHPFunctionNum,
+            $givenSavePath,
+            $expectedSavePath,
+            $givenSaveHandler,
+            $expectedSaveHandler
+        ) {
+            global $mockPHPFunctions;
+            $mockPHPFunctions = $mockPHPFunctionNum;
+
+            $sessionSaveHandler = ini_get('session.save_handler');
+            if ($expectedSavePath === 'default') {
+                $expectedSavePath = $this->defaultSavePath . '/';
+            }
+            if ($expectedSaveHandler === 'php') {
+                $expectedSaveHandler = $sessionSaveHandler;
+            }
+
+            $deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
+            $deploymentConfigMock
+                ->method('get')
+                ->willReturnCallback(function ($configPath) use ($givenSavePath, $givenSaveHandler) {
+                    switch ($configPath) {
+                        case Config::PARAM_SESSION_SAVE_METHOD:
+                            return $givenSaveHandler;
+                        case Config::PARAM_SESSION_CACHE_LIMITER:
+                            return $this->_cacheLimiter;
+                        case Config::PARAM_SESSION_SAVE_PATH:
+                            return $givenSavePath;
+                        default:
+                            return null;
+                    }
+                });
+
+            $model = $this->_objectManager->create(
+                \Magento\Framework\Session\Config::class,
+                ['deploymentConfig' => $deploymentConfigMock]
+            );
+            $this->assertEquals($expectedSavePath, $model->getOption('save_path'));
+            $this->assertEquals($expectedSaveHandler, $model->getOption('session.save_handler'));
+            global $mockPHPFunctions;
+            $mockPHPFunctions = false;
         }
 
-        $deploymentConfigMock = $this->createMock(\Magento\Framework\App\DeploymentConfig::class);
-        $deploymentConfigMock
-            ->method('get')
-            ->willReturnCallback(function ($configPath) use ($given) {
-                switch ($configPath) {
-                    case Config::PARAM_SESSION_SAVE_METHOD:
-                        return 'files';
-                    case Config::PARAM_SESSION_CACHE_LIMITER:
-                        return $this->_cacheLimiter;
-                    case Config::PARAM_SESSION_SAVE_PATH:
-                        return $given;
-                    default:
-                        return null;
-                }
-            });
-
-        $model = $this->_objectManager->create(
-            \Magento\Framework\Session\Config::class,
-            ['deploymentConfig' => $deploymentConfigMock]
-        );
-        $this->assertEquals($expected, $model->getOption('save_path'));
-
-        if ($sessionSavePath != ini_get('session.save_path')) {
-            ini_set('session.save_path', $sessionSavePath);
+        public function constructorDataProvider()
+        {
+            // preset value (null = not set), input value (null = not set), expected value
+            $savePathGiven = 'explicit_save_path';
+            $presetPath = 'preset_save_path';
+            return [
+                [2, $savePathGiven, $savePathGiven, 'db', 'db'],
+                [2, null, 'default', 'redis', 'redis'],
+                [1, $savePathGiven, $savePathGiven, null, 'php'],
+                [1, null, $presetPath, 'files', 'files'],
+            ];
         }
-    }
 
-    public function savePathDataProvider()
-    {
-        // preset value (null = not set), input value (null = not set), expected value
-        $savePathGiven = 'explicit_save_path';
-        $presetPath = 'preset_save_path';
-        return [
-            [null, $savePathGiven, $savePathGiven],
-            [null, null, 'default'],
-            [$presetPath, $savePathGiven, $savePathGiven],
-            [$presetPath, null, $presetPath],
-        ];
+        private function getModel(): \Magento\Framework\Session\Config
+        {
+            return $this->_objectManager->create(
+                \Magento\Framework\Session\Config::class,
+                ['deploymentConfig' => $this->deploymentConfigMock]
+            );
+        }
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php
index 81630b18270..c420f6fa9dd 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php
@@ -6,18 +6,41 @@
 namespace Magento\Framework\Session;
 
 use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Exception\SessionException;
+use Magento\Framework\Phrase;
 use Magento\Framework\Session\Config\ConfigInterface;
-use Magento\Framework\Session\SaveHandler;
 use Magento\Framework\App\ObjectManager;
 
 class SaveHandlerTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var string Original session.save_handler ini config value */
-    private $originalSaveHandler;
+    /**
+     * @var \Magento\TestFramework\ObjectManager
+     */
+    private $objectManager;
 
-    public function setUp()
+    /**
+     * @var DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $deploymentConfigMock;
+
+    /**
+     * @var SaveHandlerFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $saveHandlerFactoryMock;
+
+    protected function setUp()
+    {
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+        $this->objectManager->addSharedInstance($this->deploymentConfigMock, DeploymentConfig::class);
+        $this->saveHandlerFactoryMock = $this->createMock(SaveHandlerFactory::class);
+        $this->objectManager->addSharedInstance($this->saveHandlerFactoryMock, SaveHandlerFactory::class);
+    }
+
+    protected function tearDown()
     {
-        $this->originalSaveHandler = ini_get('session.save_handler');
+        $this->objectManager->removeSharedInstance(DeploymentConfig::class);
+        $this->objectManager->removeSharedInstance(SaveHandlerFactory::class);
     }
 
     /**
@@ -25,52 +48,45 @@ public function setUp()
      *
      * @dataProvider saveHandlerProvider
      * @param string $deploymentConfigHandler
-     * @param string $iniHandler
      */
-    public function testSetSaveHandler($deploymentConfigHandler, $iniHandler)
+    public function testConstructor($deploymentConfigHandler)
     {
-        $expected = $this->getExpectedSaveHandler($deploymentConfigHandler, $iniHandler);
+        $expected = $this->getExpectedSaveHandler($deploymentConfigHandler, ini_get('session.save_handler'));
 
-        // Set ini configuration
-        if ($iniHandler) {
-            ini_set('session.save_handler', $iniHandler);
-        }
-        $defaultHandler = ini_get('session.save_handler') ?: SaveHandlerInterface::DEFAULT_HANDLER;
-        /** @var DeploymentConfig | \PHPUnit_Framework_MockObject_MockObject $deploymentConfigMock */
-        $deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $deploymentConfigMock->expects($this->once())
-            ->method('get')
-            ->with(Config::PARAM_SESSION_SAVE_METHOD, $defaultHandler)
-            ->willReturn($deploymentConfigHandler ?: SaveHandlerInterface::DEFAULT_HANDLER);
+        $this->deploymentConfigMock->method('get')
+            ->willReturnCallback(function ($configPath) use ($deploymentConfigHandler) {
+                switch ($configPath) {
+                    case Config::PARAM_SESSION_SAVE_METHOD:
+                        return $deploymentConfigHandler;
+                    case Config::PARAM_SESSION_CACHE_LIMITER:
+                        return 'private_no_expire';
+                    case Config::PARAM_SESSION_SAVE_PATH:
+                        return 'explicit_save_path';
+                    default:
+                        return null;
+                }
+            });
 
-        new SaveHandler(
-            ObjectManager::getInstance()->get(SaveHandlerFactory::class),
-            $deploymentConfigMock
-        );
+        $this->saveHandlerFactoryMock->expects($this->once())
+            ->method('create')
+            ->with($expected);
+        $sessionConfig = $this->objectManager->create(ConfigInterface::class);
+        $this->objectManager->create(SaveHandler::class, ['sessionConfig' => $sessionConfig]);
 
         // Test expectation
         $this->assertEquals(
             $expected,
-            ObjectManager::getInstance()->get(ConfigInterface::class)->getOption('session.save_handler')
+            $sessionConfig->getOption('session.save_handler')
         );
     }
 
-    public function tearDown()
-    {
-        if (isset($this->originalSaveHandler)) {
-            ini_set('session.save_handler', $this->originalSaveHandler);
-        }
-    }
-
     public function saveHandlerProvider()
     {
         return [
-            ['db', false],
-            ['db', 'files'],
-            [false, 'files'],
-            [false, false],
+            ['db'],
+            ['redis'],
+            ['files'],
+            [false],
         ];
     }
 
@@ -83,21 +99,44 @@ public function saveHandlerProvider()
      */
     private function getExpectedSaveHandler($deploymentConfigHandler, $iniHandler)
     {
-        // Set expected session.save_handler config
         if ($deploymentConfigHandler) {
-            if ($deploymentConfigHandler !== 'files') {
-                $expected = 'user';
-                return $expected;
-            } else {
-                $expected = $deploymentConfigHandler;
-                return $expected;
-            }
+            return $deploymentConfigHandler;
         } elseif ($iniHandler) {
-            $expected = $iniHandler;
-            return $expected;
+            return $iniHandler;
         } else {
-            $expected = SaveHandlerInterface::DEFAULT_HANDLER;
-            return $expected;
+            return SaveHandlerInterface::DEFAULT_HANDLER;
         }
     }
+
+    public function testConstructorWithException()
+    {
+        $this->deploymentConfigMock->method('get')
+            ->willReturnCallback(function ($configPath) {
+                switch ($configPath) {
+                    case Config::PARAM_SESSION_SAVE_METHOD:
+                        return 'db';
+                    case Config::PARAM_SESSION_CACHE_LIMITER:
+                        return 'private_no_expire';
+                    case Config::PARAM_SESSION_SAVE_PATH:
+                        return 'explicit_save_path';
+                    default:
+                        return null;
+                }
+            });
+
+        $this->saveHandlerFactoryMock->expects($this->at(0))
+            ->method('create')
+            ->willThrowException(new SessionException(new Phrase('Session Exception')));
+        $this->saveHandlerFactoryMock->expects($this->at(1))
+            ->method('create')
+            ->with(SaveHandlerInterface::DEFAULT_HANDLER);
+        $sessionConfig = $this->objectManager->create(ConfigInterface::class);
+        $this->objectManager->create(SaveHandler::class, ['sessionConfig' => $sessionConfig]);
+
+        // Test expectation
+        $this->assertEquals(
+            'db',
+            $sessionConfig->getOption('session.save_handler')
+        );
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
index 1cfe77b22a6..3205c19445e 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
@@ -10,7 +10,9 @@
 
 namespace Magento\Framework\Session {
 
+    use Magento\Framework\App\DeploymentConfig;
     use Magento\Framework\App\State;
+
     // @codingStandardsIgnoreEnd
 
     /**
@@ -36,30 +38,72 @@ function headers_sent()
         return call_user_func_array('\headers_sent', func_get_args());
     }
 
+    /**
+     * Mock ini_set global function
+     *
+     * @param string $varName
+     * @param string $newValue
+     * @return bool|string
+     */
+    function ini_set($varName, $newValue)
+    {
+        global $mockPHPFunctions;
+        if ($mockPHPFunctions) {
+            SessionManagerTest::$isIniSetInvoked[$varName] = $newValue;
+            return true;
+        }
+        return call_user_func_array('\ini_set', func_get_args());
+    }
+
+    /**
+     * Mock session_set_save_handler global function
+     *
+     * @return bool
+     */
+    function session_set_save_handler()
+    {
+        global $mockPHPFunctions;
+        if ($mockPHPFunctions) {
+            SessionManagerTest::$isSessionSetSaveHandlerInvoked = true;
+            return true;
+        }
+        return call_user_func_array('\session_set_save_handler', func_get_args());
+    }
+
     /**
      * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
      */
     class SessionManagerTest extends \PHPUnit\Framework\TestCase
     {
+        /**
+         * @var string[]
+         */
+        public static $isIniSetInvoked = [];
+
+        /**
+         * @var bool
+         */
+        public static $isSessionSetSaveHandlerInvoked;
+
         /**
          * @var \Magento\Framework\Session\SessionManagerInterface
          */
-        protected $_model;
+        private $model;
 
         /**
          * @var \Magento\Framework\Session\SidResolverInterface
          */
-        protected $_sidResolver;
+        private $sidResolver;
 
         /**
          * @var string
          */
-        protected $sessionName;
+        private $sessionName;
 
         /**
-         * @var \Magento\Framework\ObjectManagerInterface
+         * @var \Magento\TestFramework\ObjectManager
          */
-        protected $objectManager;
+        private $objectManager;
 
         /**
          * @var \Magento\Framework\App\RequestInterface
@@ -87,7 +131,7 @@ protected function setUp()
                 ->getMock();
 
             /** @var \Magento\Framework\Session\SidResolver $sidResolver */
-            $this->_sidResolver = $this->objectManager->create(
+            $this->sidResolver = $this->objectManager->create(
                 \Magento\Framework\Session\SidResolver::class,
                 [
                     'appState' => $this->appState,
@@ -95,36 +139,31 @@ protected function setUp()
             );
 
             $this->request = $this->objectManager->get(\Magento\Framework\App\RequestInterface::class);
-
-            /** @var \Magento\Framework\Session\SessionManager _model */
-            $this->_model = $this->objectManager->create(
-                \Magento\Framework\Session\SessionManager::class,
-                [
-                    $this->objectManager->get(\Magento\Framework\App\Request\Http::class),
-                    $this->_sidResolver,
-                    $this->objectManager->get(\Magento\Framework\Session\Config\ConfigInterface::class),
-                    $this->objectManager->get(\Magento\Framework\Session\SaveHandlerInterface::class),
-                    $this->objectManager->get(\Magento\Framework\Session\ValidatorInterface::class),
-                    $this->objectManager->get(\Magento\Framework\Session\StorageInterface::class)
-                ]
-            );
         }
 
         protected function tearDown()
         {
             global $mockPHPFunctions;
             $mockPHPFunctions = false;
+            self::$isIniSetInvoked = [];
+            self::$isSessionSetSaveHandlerInvoked = false;
+            if ($this->model !== null) {
+                $this->model->destroy();
+                $this->model = null;
+            }
         }
 
         public function testSessionNameFromIni()
         {
-            $this->_model->start();
-            $this->assertSame($this->sessionName, $this->_model->getName());
-            $this->_model->destroy();
+            $this->initializeModel();
+            $this->model->start();
+            $this->assertSame($this->sessionName, $this->model->getName());
+            $this->model->destroy();
         }
 
         public function testSessionUseOnlyCookies()
         {
+            $this->initializeModel();
             $expectedValue = '1';
             $sessionUseOnlyCookies = ini_get('session.use_only_cookies');
             $this->assertSame($expectedValue, $sessionUseOnlyCookies);
@@ -132,49 +171,57 @@ public function testSessionUseOnlyCookies()
 
         public function testGetData()
         {
-            $this->_model->setData(['test_key' => 'test_value']);
-            $this->assertEquals('test_value', $this->_model->getData('test_key', true));
-            $this->assertNull($this->_model->getData('test_key'));
+            $this->initializeModel();
+            $this->model->setData(['test_key' => 'test_value']);
+            $this->assertEquals('test_value', $this->model->getData('test_key', true));
+            $this->assertNull($this->model->getData('test_key'));
         }
 
         public function testGetSessionId()
         {
-            $this->assertEquals(session_id(), $this->_model->getSessionId());
+            $this->initializeModel();
+            $this->assertEquals(session_id(), $this->model->getSessionId());
         }
 
         public function testGetName()
         {
-            $this->assertEquals(session_name(), $this->_model->getName());
+            $this->initializeModel();
+            $this->assertEquals(session_name(), $this->model->getName());
         }
 
         public function testSetName()
         {
-            $this->_model->setName('test');
-            $this->assertEquals('test', $this->_model->getName());
+            $this->initializeModel();
+            $this->model->destroy();
+            $this->model->setName('test');
+            $this->model->start();
+            $this->assertEquals('test', $this->model->getName());
         }
 
         public function testDestroy()
         {
+            $this->initializeModel();
             $data = ['key' => 'value'];
-            $this->_model->setData($data);
+            $this->model->setData($data);
 
-            $this->assertEquals($data, $this->_model->getData());
-            $this->_model->destroy();
+            $this->assertEquals($data, $this->model->getData());
+            $this->model->destroy();
 
-            $this->assertEquals([], $this->_model->getData());
+            $this->assertEquals([], $this->model->getData());
         }
 
         public function testSetSessionId()
         {
-            $sessionId = $this->_model->getSessionId();
+            $this->initializeModel();
+            $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());
+            $this->model->setSessionId($this->sidResolver->getSid($this->model));
+            $this->assertEquals($sessionId, $this->model->getSessionId());
 
-            $this->_model->setSessionId('test');
-            $this->assertEquals('test', $this->_model->getSessionId());
+            $this->model->setSessionId('test');
+            $this->assertEquals('test', $this->model->getSessionId());
         }
 
         /**
@@ -182,40 +229,43 @@ public function testSetSessionId()
          */
         public function testSetSessionIdFromParam()
         {
+            $this->initializeModel();
             $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));
-            $this->assertEquals('test-id', $this->_model->getSessionId());
+            $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));
+            $this->assertEquals('test-id', $this->model->getSessionId());
             /* Use not valid identifier */
-            $this->request->getQuery()->set($this->_sidResolver->getSessionIdQueryParam($this->_model), 'test_id');
-            $this->_model->setSessionId($this->_sidResolver->getSid($this->_model));
-            $this->assertEquals('test-id', $this->_model->getSessionId());
+            $this->request->getQuery()->set($this->sidResolver->getSessionIdQueryParam($this->model), 'test_id');
+            $this->model->setSessionId($this->sidResolver->getSid($this->model));
+            $this->assertEquals('test-id', $this->model->getSessionId());
         }
 
         public function testGetSessionIdForHost()
         {
+            $this->initializeModel();
             $_SERVER['HTTP_HOST'] = 'localhost';
-            $this->_model->start();
-            $this->assertEmpty($this->_model->getSessionIdForHost('localhost'));
-            $this->assertNotEmpty($this->_model->getSessionIdForHost('test'));
-            $this->_model->destroy();
+            $this->model->start();
+            $this->assertEmpty($this->model->getSessionIdForHost('localhost'));
+            $this->assertNotEmpty($this->model->getSessionIdForHost('test'));
+            $this->model->destroy();
         }
 
         public function testIsValidForHost()
         {
+            $this->initializeModel();
             $_SERVER['HTTP_HOST'] = 'localhost';
-            $this->_model->start();
+            $this->model->start();
 
-            $reflection = new \ReflectionMethod($this->_model, '_addHost');
+            $reflection = new \ReflectionMethod($this->model, '_addHost');
             $reflection->setAccessible(true);
-            $reflection->invoke($this->_model);
+            $reflection->invoke($this->model);
 
-            $this->assertFalse($this->_model->isValidForHost('test.com'));
-            $this->assertTrue($this->_model->isValidForHost('localhost'));
-            $this->_model->destroy();
+            $this->assertFalse($this->model->isValidForHost('test.com'));
+            $this->assertTrue($this->model->isValidForHost('localhost'));
+            $this->model->destroy();
         }
 
         /**
@@ -233,9 +283,9 @@ public function testStartAreaNotSet()
              *
              * @var \Magento\Framework\Session\SessionManager _model
              */
-            $this->_model = new \Magento\Framework\Session\SessionManager(
+            $this->model = new \Magento\Framework\Session\SessionManager(
                 $this->objectManager->get(\Magento\Framework\App\Request\Http::class),
-                $this->_sidResolver,
+                $this->sidResolver,
                 $this->objectManager->get(\Magento\Framework\Session\Config\ConfigInterface::class),
                 $this->objectManager->get(\Magento\Framework\Session\SaveHandlerInterface::class),
                 $this->objectManager->get(\Magento\Framework\Session\ValidatorInterface::class),
@@ -247,7 +297,63 @@ public function testStartAreaNotSet()
 
             global $mockPHPFunctions;
             $mockPHPFunctions = true;
-            $this->_model->start();
+            $this->model->start();
+        }
+
+        public function testConstructor()
+        {
+            global $mockPHPFunctions;
+            $mockPHPFunctions = true;
+
+            $deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+            $deploymentConfigMock->method('get')
+                ->willReturnCallback(function ($configPath) {
+                    switch ($configPath) {
+                        case Config::PARAM_SESSION_SAVE_METHOD:
+                            return 'db';
+                        case Config::PARAM_SESSION_CACHE_LIMITER:
+                            return 'private_no_expire';
+                        case Config::PARAM_SESSION_SAVE_PATH:
+                            return 'explicit_save_path';
+                        default:
+                            return null;
+                    }
+                });
+            $sessionConfig = $this->objectManager->create(Config::class, ['deploymentConfig' => $deploymentConfigMock]);
+            $saveHandler = $this->objectManager->create(SaveHandler::class, ['sessionConfig' => $sessionConfig]);
+
+            $this->model = $this->objectManager->create(
+                \Magento\Framework\Session\SessionManager::class,
+                [
+                    'sidResolver' => $this->sidResolver,
+                    'saveHandler' => $saveHandler,
+                    'sessionConfig' => $sessionConfig,
+                ]
+            );
+            $this->assertEquals('db', $sessionConfig->getOption('session.save_handler'));
+            $this->assertEquals('private_no_expire', $sessionConfig->getOption('session.cache_limiter'));
+            $this->assertEquals('explicit_save_path', $sessionConfig->getOption('session.save_path'));
+            $this->assertArrayHasKey('session.use_only_cookies', self::$isIniSetInvoked);
+            $this->assertEquals('1', self::$isIniSetInvoked['session.use_only_cookies']);
+            foreach ($sessionConfig->getOptions() as $option => $value) {
+                if ($option=='session.save_handler') {
+                    $this->assertArrayNotHasKey('session.save_handler', self::$isIniSetInvoked);
+                } else {
+                    $this->assertArrayHasKey($option, self::$isIniSetInvoked);
+                    $this->assertEquals($value, self::$isIniSetInvoked[$option]);
+                }
+            }
+            $this->assertTrue(self::$isSessionSetSaveHandlerInvoked);
+        }
+
+        private function initializeModel(): void
+        {
+            $this->model = $this->objectManager->create(
+                \Magento\Framework\Session\SessionManager::class,
+                [
+                    'sidResolver' => $this->sidResolver
+                ]
+            );
         }
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
index 6e043728b07..e9284225284 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
@@ -154,10 +154,12 @@ public function testGetSessionIdQueryParam()
 
     public function testGetSessionIdQueryParamCustom()
     {
+        $this->session->destroy();
         $oldSessionName = $this->session->getName();
         $this->session->setName($this->customSessionName);
         $this->assertEquals($this->customSessionQueryParam, $this->model->getSessionIdQueryParam($this->session));
         $this->session->setName($oldSessionName);
+        $this->session->start();
     }
 
     public function testSetGetUseSessionVar()
diff --git a/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php b/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
index 73e6fba8276..6d820575896 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
@@ -3,10 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework;
 
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Helper\CacheCleaner;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
 /**
  * @magentoAppIsolation enabled
@@ -15,28 +17,33 @@
  */
 class TranslateTest extends \PHPUnit\Framework\TestCase
 {
-    /** @var \Magento\Framework\Translate */
+    /**
+     * @var \Magento\Framework\Translate
+     */
     private $translate;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp()
     {
-        /** @var \Magento\Framework\View\FileSystem $viewFileSystem */
+        /** @var \Magento\Framework\View\FileSystem|MockObject $viewFileSystem */
         $viewFileSystem = $this->createPartialMock(
             \Magento\Framework\View\FileSystem::class,
-            ['getLocaleFileName', 'getDesignTheme']
+            ['getLocaleFileName']
         );
 
         $viewFileSystem->expects($this->any())
             ->method('getLocaleFileName')
             ->will(
-                $this->returnValue(dirname(__DIR__) . '/Theme/Model/_files/design/frontend/Test/default/i18n/en_US.csv')
+                $this->returnValue(
+                    dirname(__DIR__) . '/Translation/Model/_files/Magento/design/Magento/theme/i18n/en_US.csv'
+                )
             );
 
-        /** @var \Magento\Framework\View\Design\ThemeInterface $theme */
+        /** @var \Magento\Framework\View\Design\ThemeInterface|MockObject $theme */
         $theme = $this->createMock(\Magento\Framework\View\Design\ThemeInterface::class);
-        $theme->expects($this->any())->method('getId')->will($this->returnValue(10));
-
-        $viewFileSystem->expects($this->any())->method('getDesignTheme')->will($this->returnValue($theme));
+        $theme->expects($this->any())->method('getThemePath')->will($this->returnValue('Magento/luma'));
 
         /** @var \Magento\TestFramework\ObjectManager $objectManager */
         $objectManager = Bootstrap::getObjectManager();
@@ -55,7 +62,7 @@ protected function setUp()
             dirname(__DIR__) . '/Translation/Model/_files/Magento/Catalog/i18n'
         );
 
-        /** @var \Magento\Theme\Model\View\Design $designModel */
+        /** @var \Magento\Theme\Model\View\Design|MockObject $designModel */
         $designModel = $this->getMockBuilder(\Magento\Theme\Model\View\Design::class)
             ->setMethods(['getDesignTheme'])
             ->setConstructorArgs(
@@ -71,7 +78,7 @@ protected function setUp()
             )
             ->getMock();
 
-        $designModel->expects($this->any())->method('getDesignTheme')->will($this->returnValue($theme));
+        $designModel->expects($this->any())->method('getDesignTheme')->willReturn($theme);
 
         $objectManager->addSharedInstance($designModel, \Magento\Theme\Model\View\Design\Proxy::class);
 
@@ -96,6 +103,11 @@ public function testLoadData()
     /**
      * @magentoCache all disabled
      * @dataProvider translateDataProvider
+     *
+     * @param string $inputText
+     * @param string $expectedTranslation
+     * @return void
+     * @throws Exception\LocalizedException
      */
     public function testTranslate($inputText, $expectedTranslation)
     {
@@ -111,9 +123,26 @@ public function translateDataProvider()
     {
         return [
             ['', ''],
-            ['Text with different translation on different modules', 'Text translation that was last loaded'],
-            ['text_with_no_translation', 'text_with_no_translation'],
-            ['Design value to translate', 'Design translated value']
+            [
+                'Theme phrase will be translated',
+                'Theme phrase is translated',
+            ],
+            [
+                'Phrase in Magento_Store module that doesn\'t need translation',
+                'Phrase in Magento_Store module that doesn\'t need translation',
+            ],
+            [
+                'Phrase in Magento_Catalog module that doesn\'t need translation',
+                'Phrase in Magento_Catalog module that doesn\'t need translation',
+            ],
+            [
+                'Magento_Store module phrase will be overridden by theme translation',
+                'Magento_Store module phrase is overridden by theme translation',
+            ],
+            [
+                'Magento_Catalog module phrase will be overridden by theme translation',
+                'Magento_Catalog module phrase is overridden by theme translation',
+            ],
         ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/_files/product.php b/dev/tests/integration/testsuite/Magento/ImportExport/_files/product.php
index 447b4da8ee4..b1a239ccd22 100644
--- a/dev/tests/integration/testsuite/Magento/ImportExport/_files/product.php
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/_files/product.php
@@ -26,5 +26,5 @@
 )->setCateroryIds(
     []
 )->setStockData(
-    ['qty' => 100, 'is_in_stock' => 1]
+    ['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1]
 )->save();
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_express.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_express.php
index 9ba976a89e4..ba6f844b228 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_express.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_express.php
@@ -33,6 +33,7 @@
         [
             'qty' => 100,
             'is_in_stock' => 1,
+            'manage_stock' => 1,
         ]
     )->save();
 $product->load(1);
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro.php b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro.php
index bc080c894d4..9b7e296d12c 100644
--- a/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro.php
+++ b/dev/tests/integration/testsuite/Magento/Paypal/_files/quote_payflowpro.php
@@ -59,6 +59,7 @@
             [
                 'qty' => 10,
                 'is_in_stock' => 10,
+                'manage_stock' => 1,
             ]
         )
         ->setPrice(5.69 + $i * 2)
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/default_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/default_rollback.php
index 676fedbb19f..a0316b77348 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/default_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/default_rollback.php
@@ -25,5 +25,10 @@
     $product->delete();
 }
 
+/** @var \Magento\CatalogInventory\Model\StockRegistryStorage $stockRegistryStorage */
+$stockRegistryStorage = Bootstrap::getObjectManager()
+    ->get(\Magento\CatalogInventory\Model\StockRegistryStorage::class);
+$stockRegistryStorage->clean();
+
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php
index 01e54689a3c..d2557ddd329 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php
@@ -21,6 +21,7 @@
         [
             'qty' => 100,
             'is_in_stock' => 1,
+            'manage_stock' => 1,
         ]
     )->save();
 
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quote_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_rollback.php
index 3694ad9dd7a..aa5d97f0148 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/quote_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_rollback.php
@@ -27,5 +27,10 @@
     //Product already removed
 }
 
+/** @var \Magento\CatalogInventory\Model\StockRegistryStorage $stockRegistryStorage */
+$stockRegistryStorage = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\CatalogInventory\Model\StockRegistryStorage::class);
+$stockRegistryStorage->removeStockItem(1);
+
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Sitemap/_files/sitemap_products.php b/dev/tests/integration/testsuite/Magento/Sitemap/_files/sitemap_products.php
index 4700bf18a37..895b418a4e4 100644
--- a/dev/tests/integration/testsuite/Magento/Sitemap/_files/sitemap_products.php
+++ b/dev/tests/integration/testsuite/Magento/Sitemap/_files/sitemap_products.php
@@ -42,7 +42,7 @@
 )->setWebsiteIds(
     [1]
 )->setStockData(
-    ['qty' => 100, 'is_in_stock' => 1]
+    ['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1]
 )->save();
 
 /** @var \Magento\Catalog\Api\Data\ProductLinkInterface $productLink */
diff --git a/dev/tests/integration/testsuite/Magento/SwaggerWebapi/Block/Swagger/IndexTest.php b/dev/tests/integration/testsuite/Magento/SwaggerWebapi/Block/Swagger/IndexTest.php
new file mode 100644
index 00000000000..cf1c87e2b22
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/SwaggerWebapi/Block/Swagger/IndexTest.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\SwaggerWebapi\Block\Swagger;
+
+/**
+ * @magentoAppArea frontend
+ */
+class IndexTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var \Magento\Swagger\Block\Index
+     */
+    private $block;
+
+    protected function setUp()
+    {
+        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\App\State::class)
+            ->setAreaCode('frontend');
+
+        $this->block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+            \Magento\Framework\View\LayoutInterface::class
+        )->createBlock(
+            \Magento\Swagger\Block\Index::class,
+            '',
+            [
+                'data' => [
+                    'schema_types' => [
+                        'rest' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+                            \Magento\SwaggerWebapi\Model\SchemaType\Rest::class
+                        )
+                    ],
+                    'default_schema_type_code' => 'rest'
+                ]
+            ]
+        );
+    }
+
+    /**
+     * Test that the Swagger UI outputs rest as the default when there is no type parameter supplied via URL.
+     */
+    public function testDefaultSchemaUrlOutput()
+    {
+        $this->assertStringEndsWith('/rest/all/schema?services=all', $this->block->getSchemaUrl());
+    }
+
+    /**
+     * Test that Swagger UI outputs the supplied store code when it is specified.
+     */
+    public function testSchemaUrlOutputWithStore()
+    {
+        $this->block->getRequest()->setParams([
+            'store' => 'custom',
+        ]);
+
+        $this->assertStringEndsWith('/rest/custom/schema?services=all', $this->block->getSchemaUrl());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Model/Config/Processor/DesignThemeTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/Config/Processor/DesignThemeTest.php
new file mode 100644
index 00000000000..01c8ebca57a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/Config/Processor/DesignThemeTest.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Theme\Model\Config\Processor;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+class DesignThemeTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * Verifies that empty 'design/theme/theme_id' config value is processed without errors.
+     */
+    public function testProcessWithEmptyThemeId()
+    {
+        $designTheme = Bootstrap::getObjectManager()->create(DesignTheme::class);
+
+        $config = [
+            'default' => [
+                'design' => ['theme' => ['theme_id' => '']],
+            ],
+        ];
+
+        $this->assertEquals($config, $designTheme->process($config));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Translation/Model/_files/Magento/design/Magento/theme/i18n/en_US.csv b/dev/tests/integration/testsuite/Magento/Translation/Model/_files/Magento/design/Magento/theme/i18n/en_US.csv
new file mode 100644
index 00000000000..13693ffc981
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Translation/Model/_files/Magento/design/Magento/theme/i18n/en_US.csv
@@ -0,0 +1,3 @@
+"Theme phrase will be translated","Theme phrase is translated"
+"Magento_Catalog module phrase will be overridden by theme translation","Magento_Catalog module phrase is overridden by theme translation"
+"Magento_Store module phrase will be overridden by theme translation","Magento_Store module phrase is overridden by theme translation"
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php
index a356406a95a..1ebbb35dd7d 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Controller/UrlRewriteTest.php
@@ -5,7 +5,10 @@
  */
 namespace Magento\UrlRewrite\Controller;
 
-class UrlRewriteTest extends \Magento\TestFramework\TestCase\AbstractController
+use Magento\TestFramework\TestCase\AbstractController;
+use Magento\Framework\App\Response\Http as HttpResponse;
+
+class UrlRewriteTest extends AbstractController
 {
     /**
      * @magentoDataFixture Magento/UrlRewrite/_files/url_rewrite.php
@@ -16,17 +19,27 @@ class UrlRewriteTest extends \Magento\TestFramework\TestCase\AbstractController
      *
      * @param string $request
      * @param string $redirect
+     * @param int $expectedCode
      *
      * @dataProvider requestDataProvider
      */
-    public function testMatchUrlRewrite($request, $redirect)
-    {
+    public function testMatchUrlRewrite(
+        string $request,
+        string $redirect,
+        int $expectedCode = 301
+    ) {
         $this->dispatch($request);
-        $code = $this->getResponse()->getHttpResponseCode();
-        $location = $this->getResponse()->getHeader('Location')->getFieldValue();
+        /** @var HttpResponse $response */
+        $response = $this->getResponse();
+        $code = $response->getHttpResponseCode();
+        $location = $response->getHeader('Location')->getFieldValue();
 
-        $this->assertEquals(301, $code, 'Invalid response code');
-        $this->assertStringEndsWith($redirect, $location, 'Invalid location header');
+        $this->assertEquals($expectedCode, $code, 'Invalid response code');
+        $this->assertStringEndsWith(
+            $redirect,
+            $location,
+            'Invalid location header'
+        );
     }
 
     public function requestDataProvider()
@@ -56,6 +69,12 @@ public function requestDataProvider()
                 'request' => '/page-similar/',
                 'redirect' => '/page-b',
             ],
+            'Use Case #7: Rewrite during stores switching' => [
+                'request' => '/page-c-on-2nd-store'
+                    . '?___store=default&___from_store=fixture_second_store',
+                'redirect' => '/page-c-on-1st-store',
+                'expectedCode' => 302
+            ],
         ];
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite.php
index 37cb86aff3b..8e82aa853d4 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/_files/url_rewrite.php
@@ -6,35 +6,62 @@
 
 use \Magento\UrlRewrite\Model\OptionProvider;
 use \Magento\UrlRewrite\Model\UrlRewrite;
+use \Magento\TestFramework\Helper\Bootstrap;
+use \Magento\Store\Model\StoreManagerInterface;
+use \Magento\Store\Model\Store;
+use \Magento\UrlRewrite\Model\ResourceModel\UrlRewrite as UrlRewriteResource;
+use \Magento\Framework\ObjectManagerInterface;
+use \Magento\Cms\Model\ResourceModel\Page as PageResource;
+use \Magento\Cms\Model\Page;
+
+/** Create fixture store */
+require dirname(dirname(__DIR__)) . '/Store/_files/second_store.php';
 
 /** @var UrlRewrite $rewrite */
-/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-/** @var \Magento\UrlRewrite\Model\ResourceModel\UrlRewrite $rewriteResource */
-$rewriteResource = $objectManager->create(\Magento\UrlRewrite\Model\ResourceModel\UrlRewrite::class);
-/** @var \Magento\Cms\Model\ResourceModel\Page $pageResource */
-$pageResource = $objectManager->create(\Magento\Cms\Model\ResourceModel\Page::class);
+/** @var ObjectManagerInterface $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+/** @var UrlRewriteResource $rewriteResource */
+$rewriteResource = $objectManager->create(UrlRewriteResource::class);
+/** @var PageResource $pageResource */
+$pageResource = $objectManager->create(PageResource::class);
+/** @var StoreManagerInterface $storeManager */
+$storeManager = Bootstrap::getObjectManager()
+    ->get(StoreManagerInterface::class);
 
+/** @var Store $secondStore */
+$secondStore = Bootstrap::getObjectManager()->create(Store::class);
+$secondStore->load('fixture_second_store');
+$secondStoreId = $secondStore->getId();
 $storeID = 1;
 
-/** @var $page \Magento\Cms\Model\Page */
-$page = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Cms\Model\Page::class);
+/** @var $page Page */
+$page = $objectManager->create(Page::class);
 $page->setTitle('Cms Page A')
     ->setIdentifier('page-a')
-    ->setStores([$storeID])
     ->setIsActive(1)
     ->setContent('<h1>Cms Page A</h1>')
-    ->setPageLayout('1column');
+    ->setPageLayout('1column')
+    ->setStores([$storeID, $secondStoreId]);
 $pageResource->save($page);
 
-$page = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Cms\Model\Page::class);
+$page = $objectManager->create(Page::class);
 $page->setTitle('Cms B')
     ->setIdentifier('page-b')
-    ->setStores([$storeID])
     ->setIsActive(1)
     ->setContent('<h1>Cms Page B</h1>')
     ->setPageLayout('1column')
-    ->setCustomTheme('Magento/blank');
+    ->setCustomTheme('Magento/blank')
+    ->setStores([$storeID, $secondStoreId]);
+$pageResource->save($page);
+
+$page = $objectManager->create(Page::class);
+$page->setTitle('Cms C')
+    ->setIdentifier('page-c')
+    ->setIsActive(1)
+    ->setContent('<h1>Cms Page C</h1>')
+    ->setPageLayout('1column')
+    ->setCustomTheme('Magento/blank')
+    ->setStores([$storeID, $secondStoreId]);
 $pageResource->save($page);
 
 $rewrite = $objectManager->create(UrlRewrite::class);
@@ -72,3 +99,21 @@
     ->setStoreId($storeID)
     ->setDescription('From age-similar with trailing slash to page-b');
 $rewriteResource->save($rewrite);
+
+//Emulating auto-generated aliases (like the ones used for categories).
+//Rewrite rule for the 1st store.
+$rewrite = $objectManager->create(UrlRewrite::class);
+$rewrite->setEntityType('custom')
+    ->setRequestPath('page-c-on-1st-store')
+    ->setTargetPath('page-c')
+    ->setRedirectType(0)
+    ->setStoreId($storeID);
+$rewriteResource->save($rewrite);
+//Rewrite rule for the 2nd store.
+$rewrite = $objectManager->create(UrlRewrite::class);
+$rewrite->setEntityType('custom')
+    ->setRequestPath('page-c-on-2nd-store')
+    ->setTargetPath('page-c')
+    ->setRedirectType(0)
+    ->setStoreId($secondStoreId);
+$rewriteResource->save($rewrite);
diff --git a/dev/tests/integration/testsuite/Magento/Webapi/Controller/Rest/SchemaRequestProcessorTest.php b/dev/tests/integration/testsuite/Magento/Webapi/Controller/Rest/SchemaRequestProcessorTest.php
new file mode 100644
index 00000000000..70437bcffbb
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Webapi/Controller/Rest/SchemaRequestProcessorTest.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Webapi\Controller\Rest;
+
+use Magento\TestFramework\TestCase\AbstractController;
+
+class SchemaRequestProcessorTest extends AbstractController
+{
+    /**
+     * Test that the rest controller returns the correct schema response.
+     *
+     * @param string $path
+     * @dataProvider schemaRequestProvider
+     */
+    public function testSchemaRequest($path)
+    {
+        ob_start();
+        $this->dispatch($path);
+        ob_end_clean();
+        $schema = $this->getResponse()->getBody();
+
+        // Check that an HTTP 200 response status is visible in the schema.
+        $this->assertRegExp('/200 Success/', $schema);
+    }
+
+    /**
+     * Response getter
+     *
+     * @return \Magento\Framework\App\ResponseInterface
+     */
+    public function getResponse()
+    {
+        if (!$this->_response) {
+            $this->_response = $this->_objectManager->get(\Magento\Framework\Webapi\Rest\Response::class);
+        }
+        return $this->_response;
+    }
+
+    /**
+     * @return array
+     */
+    public function schemaRequestProvider()
+    {
+        return [
+            ['rest/schema'],
+            ['rest/schema?services=all'],
+            ['rest/all/schema?services=all'],
+            ['rest/default/schema?services=all'],
+            ['rest/schema?services=all'],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/WebapiAsync/Controller/Rest/AsynchronousSchemaRequestProcessorMock.php b/dev/tests/integration/testsuite/Magento/WebapiAsync/Controller/Rest/AsynchronousSchemaRequestProcessorMock.php
new file mode 100644
index 00000000000..f60e57fce8b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/WebapiAsync/Controller/Rest/AsynchronousSchemaRequestProcessorMock.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\WebapiAsync\Controller\Rest;
+
+class AsynchronousSchemaRequestProcessorMock extends AsynchronousSchemaRequestProcessor
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function canProcess(\Magento\Framework\Webapi\Rest\Request $request)
+    {
+        return true;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/WebapiAsync/Controller/Rest/AsynchronousSchemaRequestProcessorTest.php b/dev/tests/integration/testsuite/Magento/WebapiAsync/Controller/Rest/AsynchronousSchemaRequestProcessorTest.php
new file mode 100644
index 00000000000..67e4cdc9788
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/WebapiAsync/Controller/Rest/AsynchronousSchemaRequestProcessorTest.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\WebapiAsync\Controller\Rest;
+
+use Magento\TestFramework\TestCase\AbstractController;
+
+class AsynchronousSchemaRequestProcessorTest extends AbstractController
+{
+    /**
+     * Test that the rest controller returns the correct async schema response.
+     *
+     * @param string $path
+     * @magentoAppArea webapi_rest
+     * @dataProvider schemaRequestProvider
+     */
+    public function testSchemaRequest($path)
+    {
+        ob_start();
+        $this->dispatch($path);
+        ob_end_clean();
+        $schema = $this->getResponse()->getBody();
+
+        // Check that an HTTP 202 response is visible for what is normally an HTTP 200.
+        $this->assertRegExp('/202 Accepted/', $schema);
+
+        // Make sure that the async interface definition is included in the response.
+        $this->assertRegExp('/asynchronous-operations-data-async-response-interface/', $schema);
+    }
+
+    /**
+     * Response getter
+     *
+     * @return \Magento\Framework\App\ResponseInterface
+     */
+    public function getResponse()
+    {
+        if (!$this->_response) {
+            $this->_response = $this->_objectManager->get(\Magento\Framework\Webapi\Rest\Response::class);
+        }
+        return $this->_response;
+    }
+
+    /**
+     * @return array
+     */
+    public function schemaRequestProvider()
+    {
+        return [
+            ['rest/async/schema'],
+            ['rest/async/schema?services=all'],
+            ['rest/all/async/schema?services=all'],
+            ['rest/default/async/schema?services=all'],
+            ['rest/async/schema?services=all'],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/WebapiAsync/Model/AuthorizationMock.php b/dev/tests/integration/testsuite/Magento/WebapiAsync/Model/AuthorizationMock.php
new file mode 100644
index 00000000000..a09db933c41
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/WebapiAsync/Model/AuthorizationMock.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\WebapiAsync\Model;
+
+use Magento\Framework\Webapi\Authorization;
+
+class AuthorizationMock extends Authorization
+{
+    /**
+     * @param string[] $aclResources
+     * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function isAllowed($aclResources)
+    {
+        return true;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/WebapiAsync/Model/Rest/Swagger/GeneratorTest.php b/dev/tests/integration/testsuite/Magento/WebapiAsync/Model/Rest/Swagger/GeneratorTest.php
new file mode 100644
index 00000000000..f4b4c84b24f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/WebapiAsync/Model/Rest/Swagger/GeneratorTest.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\WebapiAsync\Model\Rest\Swagger;
+
+use Magento\Framework\Webapi\Authorization;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Webapi\Model\Rest\Swagger\Generator;
+use Magento\Webapi\Model\ServiceMetadata;
+use Magento\WebapiAsync\Controller\Rest\AsynchronousSchemaRequestProcessor;
+use Magento\WebapiAsync\Controller\Rest\AsynchronousSchemaRequestProcessorMock;
+use Magento\WebapiAsync\Model\AuthorizationMock;
+
+class GeneratorTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Generator
+     */
+    private $generator;
+
+    /**
+     * @var ServiceMetadata
+     */
+    private $serviceMetadata;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $objectManager->configure([
+            'preferences' => [
+                Authorization::class => AuthorizationMock::class,
+                AsynchronousSchemaRequestProcessor::class => AsynchronousSchemaRequestProcessorMock::class
+            ]
+        ]);
+
+        $this->generator = $objectManager->create(Generator::class);
+        $this->serviceMetadata = $objectManager->create(ServiceMetadata::class);
+    }
+
+    public function testGenerateAsync()
+    {
+        $schema = json_decode(
+            $this->generator->generate(
+                ['customerAccountManagementV1'],
+                'https',
+                'localhost',
+                '/async/schema/V1?services=customerAccountManagementV1'
+            ),
+            true
+        );
+
+        // Ensure that the correct HTTP response has been described in the schema.
+        $this->assertArrayHasKey(
+            '202',
+            $schema['paths']['/V1/customers']['post']['responses']
+        );
+
+        $this->assertArrayNotHasKey(
+            '200',
+            $schema['paths']['/V1/customers']['post']['responses']
+        );
+
+        // 202 Response should not apply to GET requests.
+        $this->assertArrayNotHasKey(
+            '/V1/customers/me/shippingAddress',
+            $schema['paths']
+        );
+
+        // Ensure that the response type has been replaced with the async version.
+        $this->assertEquals(
+            '#/definitions/asynchronous-operations-data-async-response-interface',
+            $schema['paths']['/V1/customers']['post']['responses']['202']['schema']['$ref']
+        );
+
+        // Ensure that the base path output correctly
+        $this->assertEquals('/async', $schema['basePath']);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/WebapiAsync/Plugin/ServiceMetadataTest.php b/dev/tests/integration/testsuite/Magento/WebapiAsync/Plugin/ServiceMetadataTest.php
new file mode 100644
index 00000000000..701adfe7d9c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/WebapiAsync/Plugin/ServiceMetadataTest.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\WebapiAsync\Plugin;
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Webapi\Model\ServiceMetadata;
+use Magento\WebapiAsync\Controller\Rest\AsynchronousSchemaRequestProcessor;
+use Magento\WebapiAsync\Controller\Rest\AsynchronousSchemaRequestProcessorMock;
+
+class ServiceMetadataTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var ServiceMetadata
+     */
+    private $serviceMetadata;
+
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $objectManager->configure([
+            'preferences' => [
+                AsynchronousSchemaRequestProcessor::class => AsynchronousSchemaRequestProcessorMock::class
+            ]
+        ]);
+
+        $this->serviceMetadata = $objectManager->create(ServiceMetadata::class);
+    }
+
+    public function testGetServiceMetadata()
+    {
+        $expected = [
+            'methods' => [
+                'activate' => [
+                    'method' => 'activate',
+                    'inputRequired' => false,
+                    'isSecure' => false,
+                    'resources' => [
+                        'Magento_Customer::manage'
+                    ],
+                    'documentation' => 'Activate a customer account using a key that was sent in a confirmation email.',
+                    'interface' => [
+                        'in' => [
+                            'parameters' => [
+                                'email' => [
+                                    'type' => 'string',
+                                    'required' => true,
+                                    'documentation' => null
+                                ],
+                                'confirmationKey' => [
+                                    'type' => 'string',
+                                    'required' => true,
+                                    'documentation' => null
+                                ]
+                            ]
+                        ],
+                        'out' => [
+                            'parameters' => [
+                                'result' => [
+                                    'type' => 'AsynchronousOperationsDataAsyncResponseInterface',
+                                    'required' => true,
+                                    'documentation' => 'Returns response information for the asynchronous request.',
+                                    'response_codes' => [
+                                        'success' => [
+                                            'code' => '202',
+                                            'description' => '202 Accepted.'
+                                        ]
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ]
+                ]
+            ],
+            'class' => AccountManagementInterface::class,
+            'description' => 'Interface for managing customers accounts.',
+        ];
+        $actual = $this->serviceMetadata->getServiceMetadata('customerAccountManagementV1');
+        $this->assertEquals(array_replace_recursive($actual, $expected), $actual);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Weee/_files/product_with_fpt.php b/dev/tests/integration/testsuite/Magento/Weee/_files/product_with_fpt.php
index 40d9cc74def..0e67a8947a7 100644
--- a/dev/tests/integration/testsuite/Magento/Weee/_files/product_with_fpt.php
+++ b/dev/tests/integration/testsuite/Magento/Weee/_files/product_with_fpt.php
@@ -47,7 +47,7 @@
 )->setStatus(
     \Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED
 )->setStockData(
-    ['qty' => 100, 'is_in_stock' => 1]
+    ['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1]
 )->setName(
     'Simple Product FPT'
 )->setSku(
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/url-input.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/url-input.test.js
new file mode 100644
index 00000000000..c0f55168a54
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/element/url-input.test.js
@@ -0,0 +1,76 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/*eslint max-nested-callbacks: 0*/
+
+define([
+    'jquery',
+    'Magento_Ui/js/form/element/url-input'
+], function ($, UrlInput) {
+    'use strict';
+
+    describe('Magento_Ui/js/form/element/url-input', function () {
+        var component;
+
+        beforeEach(function () {
+            var params = {
+                dataScope: 'urlInput',
+                urlTypes: {
+                    url: {
+                        label: 'Test label',
+                        component: 'Magento_Ui/js/form/element/abstract',
+                        template: 'ui/form/element/input',
+                        sortOrder: 40
+                    },
+                    testUrl: {
+                        label: 'Test label 2',
+                        component: 'Magento_Ui/js/form/element/abstract',
+                        template: 'ui/form/element/input',
+                        sortOrder: 10
+                    }
+                }
+            };
+
+            component = new UrlInput(params);
+        });
+
+        describe('processLinkTypes method', function () {
+            it('check url types were set', function () {
+                expect(component.urlTypes).toBeDefined();
+                expect(component.urlTypes.hasOwnProperty('url'));
+                expect(component.urlTypes.hasOwnProperty('testUrl'));
+            });
+        });
+
+        describe('setOptions method', function () {
+            it('check that optons were set', function () {
+                var expectedOptions = [
+                    {
+                        value: 'testUrl',
+                        label: 'Test label 2',
+                        sortOrder: 10
+                    },
+                    {
+                        value: 'url',
+                        label: 'Test label',
+                        sortOrder: 40
+                    }
+                ];
+
+                expect(component.options()).toEqual(expectedOptions);
+            });
+        });
+
+        describe('createChildUrlInputComponent method', function () {
+            it('check linked element was set', function () {
+                expect(component.linkedElementInstances.url).not.toBeDefined();
+                component.createChildUrlInputComponent('url');
+                expect(component.linkedElementInstances.url).toBeDefined();
+                expect(component.getLinkedElementName()).toEqual(component.linkedElementInstances.url);
+            });
+        });
+
+    });
+});
diff --git a/dev/tests/static/get_github_changes.php b/dev/tests/static/get_github_changes.php
index 77dd88c4d00..dba235c184e 100644
--- a/dev/tests/static/get_github_changes.php
+++ b/dev/tests/static/get_github_changes.php
@@ -42,6 +42,17 @@
 $changedFiles = getChangedFiles($changes, $fileExtensions);
 generateChangedFilesList($options['output-file'], $changedFiles);
 saveChangedFileContent($repo);
+
+$additions = retrieveNewFilesAcrossForks($mainline, $repo, $options['branch']);
+$addedFiles = getChangedFiles($additions, $fileExtensions);
+$additionsFile = pathinfo($options['output-file']);
+$additionsFile = $additionsFile['dirname']
+    . DIRECTORY_SEPARATOR
+    . $additionsFile['filename']
+    . '.added.'
+    . $additionsFile['extension'];
+generateChangedFilesList($additionsFile, $addedFiles);
+
 cleanup($repo, $mainline);
 
 /**
@@ -143,7 +154,18 @@ function getRepo($options, $mainline)
  */
 function retrieveChangesAcrossForks($mainline, GitRepo $repo, $branchName)
 {
-    return $repo->compareChanges($mainline, $branchName);
+    return $repo->compareChanges($mainline, $branchName, GitRepo::CHANGE_TYPE_ALL);
+}
+
+/**
+ * @param string $mainline
+ * @param GitRepo $repo
+ * @param string $branchName
+ * @return array
+ */
+function retrieveNewFilesAcrossForks($mainline, GitRepo $repo, $branchName)
+{
+    return $repo->compareChanges($mainline, $branchName, GitRepo::CHANGE_TYPE_ADDED);
 }
 
 /**
@@ -178,6 +200,10 @@ function validateInput(array $options, array $requiredOptions)
 class GitRepo
 // @codingStandardsIgnoreEnd
 {
+    const CHANGE_TYPE_ADDED = 1;
+    const CHANGE_TYPE_MODIFIED = 2;
+    const CHANGE_TYPE_ALL = 3;
+
     /**
      * Absolute path to git project
      *
@@ -274,9 +300,10 @@ public function getBranches($source = '--all')
      *
      * @param string $remoteAlias
      * @param string $remoteBranch
+     * @param int $changesType
      * @return array
      */
-    public function compareChanges($remoteAlias, $remoteBranch)
+    public function compareChanges($remoteAlias, $remoteBranch, $changesType = self::CHANGE_TYPE_ALL)
     {
         if (!isset($this->remoteList[$remoteAlias])) {
             throw new LogicException('Alias "' . $remoteAlias . '" is not defined');
@@ -288,7 +315,8 @@ public function compareChanges($remoteAlias, $remoteBranch)
             ? $this->filterChangedFiles(
                 $result,
                 $remoteAlias,
-                $remoteBranch
+                $remoteBranch,
+                $changesType
             )
             : [];
     }
@@ -299,50 +327,113 @@ public function compareChanges($remoteAlias, $remoteBranch)
      * @param array $changes
      * @param string $remoteAlias
      * @param string $remoteBranch
+     * @param int $changesType
      * @return array
      */
-    protected function filterChangedFiles(array $changes, $remoteAlias, $remoteBranch)
-    {
+    protected function filterChangedFiles(
+        array $changes,
+        $remoteAlias,
+        $remoteBranch,
+        $changesType = self::CHANGE_TYPE_ALL
+    ) {
         $countScannedFiles = 0;
-        $changedFilesMasks = [
-            'M' => "M\t",
-            'A' => "A\t"
-        ];
+        $changedFilesMasks = $this->buildChangedFilesMask($changesType);
         $filteredChanges = [];
         foreach ($changes as $fileName) {
             $countScannedFiles++;
             if (($countScannedFiles % 5000) == 0) {
                 echo $countScannedFiles . " files scanned so far\n";
             }
-            foreach ($changedFilesMasks as $mask) {
-                if (strpos($fileName, $mask) === 0) {
-                    $fileName = str_replace($mask, '', $fileName);
-                    $fileName = trim($fileName);
-                    if (!in_array($fileName, $filteredChanges) && is_file($this->workTree . '/' . $fileName)) {
-                        $result = $this->call(
-                            sprintf(
-                                'diff HEAD %s/%s -- %s',
-                                $remoteAlias,
-                                $remoteBranch,
-                                $this->workTree . '/' . $fileName
-                            )
-                        );
-                        if ($result) {
-                            if (!(isset($this->changedContentFiles[$fileName]))) {
-                                $this->setChangedContentFile($result, $fileName);
-                            }
-                            $filteredChanges[] = $fileName;
-                        }
-                    }
-                    break;
-                }
+
+            $changeTypeMask = $this->detectChangeTypeMask($fileName, $changedFilesMasks);
+            if (null === $changeTypeMask) {
+                continue;
             }
+
+            $fileName = trim(substr($fileName, strlen($changeTypeMask)));
+            if (in_array($fileName, $filteredChanges)) {
+                continue;
+            }
+
+            $fileChanges = $this->getFileChangeDetails($fileName, $remoteAlias, $remoteBranch);
+            if (empty($fileChanges)) {
+                continue;
+            }
+
+            if (!(isset($this->changedContentFiles[$fileName]))) {
+                $this->setChangedContentFile($fileChanges, $fileName);
+            }
+            $filteredChanges[] = $fileName;
         }
         echo $countScannedFiles . " files scanned\n";
 
         return $filteredChanges;
     }
 
+    /**
+     * Build mask of git diff report
+     *
+     * @param int $changesType
+     * @return array
+     */
+    private function buildChangedFilesMask(int $changesType): array
+    {
+        $changedFilesMasks = [];
+        foreach ([
+            self::CHANGE_TYPE_ADDED => "A\t",
+            self::CHANGE_TYPE_MODIFIED => "M\t",
+        ] as $changeType => $changedFilesMask) {
+            if ($changeType & $changesType) {
+                $changedFilesMasks[] = $changedFilesMask;
+            }
+        }
+        return $changedFilesMasks;
+    }
+
+    /**
+     * Find one of the allowed modification mask returned by git diff.
+     * Example of change record: "A path/to/added_file"
+     *
+     * @param string $changeRecord
+     * @param array $allowedMasks
+     * @return string|null
+     */
+    private function detectChangeTypeMask(string $changeRecord, array $allowedMasks)
+    {
+        foreach ($allowedMasks as $mask) {
+            if (strpos($changeRecord, $mask) === 0) {
+                return $mask;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Read detailed information about changes in a file
+     *
+     * @param string $fileName
+     * @param string $remoteAlias
+     * @param string $remoteBranch
+     * @return array
+     */
+    private function getFileChangeDetails(string $fileName, string $remoteAlias, string $remoteBranch): array
+    {
+        if (!is_file($this->workTree . '/' . $fileName)) {
+            return [];
+        }
+
+        $result = $this->call(
+            sprintf(
+                'diff HEAD %s/%s -- %s',
+                $remoteAlias,
+                $remoteBranch,
+                $this->workTree . '/' . $fileName
+            )
+        );
+
+        return $result;
+    }
+
     /**
      * Set changed content for file.
      *
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
index 87da2f13e1e..e9365a9c670 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
@@ -77,10 +77,10 @@ public function testValidComposerJson()
     {
         $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
         $invoker(
-        /**
-         * @param string $dir
-         * @param string $packageType
-         */
+            /**
+             * @param string $dir
+             * @param string $packageType
+             */
             function ($dir, $packageType) {
                 $file = $dir . '/composer.json';
                 $this->assertFileExists($file);
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/BlockNamesTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/BlockNamesTest.php
index ec1d719df2e..3bbada60fc4 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/BlockNamesTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/BlockNamesTest.php
@@ -14,11 +14,11 @@ public function testBlocksHasName()
     {
         $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
         $invoker(
-        /**
-         * Test validate that blocks without name doesn't exist in layout file
-         *
-         * @param string $layoutFile
-         */
+            /**
+             * Test validate that blocks without name doesn't exist in layout file
+             *
+             * @param string $layoutFile
+             */
             function ($layoutFile) {
                 $dom = new \DOMDocument();
                 $dom->load($layoutFile);
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/HandlesTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/HandlesTest.php
index f2370005afb..3de3d85a222 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/HandlesTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Layout/HandlesTest.php
@@ -78,11 +78,11 @@ public function testHeadBlockUsage()
     {
         $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
         $invoker(
-        /**
-         * Test validate that head block doesn't exist in layout
-         *
-         * @param string $layoutFile
-         */
+            /**
+             * Test validate that head block doesn't exist in layout
+             *
+             * @param string $layoutFile
+             */
             function ($layoutFile) {
                 $dom = new \DOMDocument();
                 $dom->load($layoutFile);
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 175a9aadbea..187cb908701 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
@@ -233,7 +233,7 @@ private function isItTest($relativeFilePath)
     private function getControllerPath($relativeFilePath)
     {
         if (preg_match('~(Magento\/.*Controller\/Adminhtml\/.*)\.php~', $relativeFilePath, $matches)) {
-            if (count($matches) === 2 && count($partPath = $matches[1]) >= 1) {
+            if (count($matches) === 2) {
                 $partPath = $matches[1];
                 return $partPath;
             }
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/_files/controller_acl_test_whitelist_ce.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/_files/controller_acl_test_whitelist_ce.txt
index 90e7ec138bf..a819654b35b 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/_files/controller_acl_test_whitelist_ce.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Backend/_files/controller_acl_test_whitelist_ce.txt
@@ -28,3 +28,7 @@ Magento\Swatches\Controller\Adminhtml\Product\Attribute\Plugin\Save
 Magento\Ui\Controller\Adminhtml\Export\GridToCsv
 Magento\Ui\Controller\Adminhtml\Export\GridToXml
 Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\AttributeFilter
+Magento\Inventory\Controller\Adminhtml\Source\SourceCarrierDataProcessor
+Magento\Inventory\Controller\Adminhtml\Source\SourceHydrator
+Magento\Inventory\Controller\Adminhtml\Stock\StockSaveProcessor
+Magento\Inventory\Controller\Adminhtml\Stock\StockSourceLinkProcessor
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Api/ExtensibleInterfacesTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Api/ExtensibleInterfacesTest.php
index a0c1f53cd16..571ed4afbb6 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Api/ExtensibleInterfacesTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Api/ExtensibleInterfacesTest.php
@@ -24,18 +24,19 @@ public function testGetSetExtensionAttributes()
     {
         $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
         $invoker(
-        /**
-         * @param string $filename
-         */
+            /**
+             * @param string $filename
+             */
             function ($filename) {
                 $errors = [];
                 $fileContent = file_get_contents($filename);
-                $extendsFromExtensibleDataInterface = preg_match(
-                    '/' . str_replace('\\', '\\\\', self::EXTENSIBLE_DATA_INTERFACE) . '/',
-                    $fileContent
-                );
+                $pattern = '/'
+                    . str_replace('\\', '\\\\', self::EXTENSIBLE_DATA_INTERFACE)
+                    . '/';
+                $extendsFromExtensibleDataInterface = preg_match($pattern, $fileContent);
+                $namespacePattern = '/namespace ([\w\\\\]+).*interface ([\w\\\\]+)/s';
                 if ($extendsFromExtensibleDataInterface
-                    && preg_match('/namespace ([\w\\\\]+).*interface ([\w\\\\]+)/s', $fileContent, $matches)
+                    && preg_match($namespacePattern, $fileContent, $matches)
                 ) {
                     $namespace = $matches[1];
                     $interfaceName = $matches[2];
@@ -158,9 +159,9 @@ public function testExtensibleClassesWithMissingInterface()
     {
         $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
         $invoker(
-        /**
-         * @param string $filename
-         */
+            /**
+             * @param string $filename
+             */
             function ($filename) {
                 $errors = [];
                 $fileContent = file_get_contents($filename);
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/ReadmeTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/ReadmeTest.php
index 3ba5b26615a..8e33698ec15 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/ReadmeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/ReadmeTest.php
@@ -35,9 +35,9 @@ public function testReadmeFiles()
     {
         $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
         $invoker(
-        /**
-         * @param string $dir
-         */
+            /**
+             * @param string $dir
+             */
             function ($dir) {
                 $file = $dir . DIRECTORY_SEPARATOR . self::README_FILENAME;
                 $this->assertFileExists(
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php
index 30e0dc621f3..5aedd806692 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/SchemaTest.php
@@ -14,9 +14,9 @@ public function testXmlFiles()
     {
         $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
         $invoker(
-        /**
-         * @param string $filename
-         */
+            /**
+             * @param string $filename
+             */
             function ($filename) {
                 $dom = new \DOMDocument();
                 $xmlFile = file_get_contents($filename);
diff --git a/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt b/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt
index 1c76dbe20ce..a67c6c4630c 100644
--- a/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Js/_files/blacklist/magento.txt
@@ -25,5 +25,4 @@ lib/web/mage/adminhtml/tools.js
 lib/web/mage/adminhtml/varienLoader.js
 lib/web/magnifier/magnifier.js
 lib/web/magnifier/magnify.js
-lib/web/varien/form.js
 lib/web/varien/js.js
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/PhtmlTemplateTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/PhtmlTemplateTest.php
index 34d3e7b77d2..7cb65c27d7f 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/PhtmlTemplateTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/PhtmlTemplateTest.php
@@ -13,11 +13,11 @@ public function testBlockVariableInsteadOfThis()
     {
         $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
         $invoker(
-        /**
-         * Test usage of methods and variables in template through $this
-         *
-         * @param string $file
-         */
+            /**
+             * Test usage of methods and variables in template through $this
+             *
+             * @param string $file
+             */
             function ($file) {
                 $this->assertNotRegExp(
                     '/this->(?!helper)\S*/iS',
@@ -61,12 +61,12 @@ public function testObsoleteJavascriptAttributeType()
     {
         $invoker = new \Magento\Framework\App\Utility\AggregateInvoker($this);
         $invoker(
-        /**
-         * "text/javascript" type attribute in not obligatory to use in templates due to HTML5 standards.
-         * For more details please go to "http://www.w3.org/TR/html5/scripting-1.html".
-         *
-         * @param string $file
-         */
+            /**
+             * "text/javascript" type attribute in not obligatory to use in templates due to HTML5 standards.
+             * For more details please go to "http://www.w3.org/TR/html5/scripting-1.html".
+             *
+             * @param string $file
+             */
             function ($file) {
                 $this->assertNotRegexp(
                     '/type="text\/javascript"/',
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
index e2442b229eb..fa62179ed34 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Php/LiveCodeTest.php
@@ -7,6 +7,7 @@
 namespace Magento\Test\Php;
 
 use Magento\Framework\App\Utility\Files;
+use Magento\Framework\Component\ComponentRegistrar;
 use Magento\TestFramework\CodingStandard\Tool\CodeMessDetector;
 use Magento\TestFramework\CodingStandard\Tool\CodeSniffer;
 use Magento\TestFramework\CodingStandard\Tool\CodeSniffer\Wrapper;
@@ -68,19 +69,28 @@ private static function getChangedFilesBaseDir()
      * @param array $fileTypes
      * @param string $changedFilesBaseDir
      * @param string $baseFilesFolder
+     * @param string $whitelistFile
      * @return array
      */
-    public static function getWhitelist($fileTypes = ['php'], $changedFilesBaseDir = '', $baseFilesFolder = '')
-    {
+    public static function getWhitelist(
+        $fileTypes = ['php'],
+        $changedFilesBaseDir = '',
+        $baseFilesFolder = '',
+        $whitelistFile = '/_files/whitelist/common.txt'
+    ) {
         $changedFiles = self::getChangedFilesList($changedFilesBaseDir);
         if (empty($changedFiles)) {
             return [];
         }
 
         $globPatternsFolder = ('' !== $baseFilesFolder) ? $baseFilesFolder : self::getBaseFilesFolder();
-        $directoriesToCheck = Files::init()->readLists($globPatternsFolder . '/_files/whitelist/common.txt');
+        try {
+            $directoriesToCheck = Files::init()->readLists($globPatternsFolder . $whitelistFile);
+        } catch (\Exception $e) {
+            // no directories matched white list
+            return [];
+        }
         $targetFiles = self::filterFiles($changedFiles, $fileTypes, $directoriesToCheck);
-
         return $targetFiles;
     }
 
@@ -101,30 +111,74 @@ public static function getWhitelist($fileTypes = ['php'], $changedFilesBaseDir =
      */
     private static function getChangedFilesList($changedFilesBaseDir)
     {
-        $changedFiles = [];
+        return self::getFilesFromListFile(
+            $changedFilesBaseDir,
+            'changed_files*',
+            function () {
+                // if no list files, probably, this is the dev environment
+                @exec('git diff --name-only', $changedFiles);
+                @exec('git diff --cached --name-only', $addedFiles);
+                $changedFiles = array_unique(array_merge($changedFiles, $addedFiles));
+                return $changedFiles;
+            }
+        );
+    }
+
+    /**
+     * This method loads list of added files.
+     *
+     * @param string $changedFilesBaseDir
+     * @return string[]
+     */
+    private static function getAddedFilesList($changedFilesBaseDir)
+    {
+        return self::getFilesFromListFile(
+            $changedFilesBaseDir,
+            'changed_files*.added.*',
+            function () {
+                // if no list files, probably, this is the dev environment
+                @exec('git diff --cached --name-only', $addedFiles);
+                return $addedFiles;
+            }
+        );
+    }
 
-        $globFilesListPattern = ($changedFilesBaseDir ?: self::getChangedFilesBaseDir()) . '/_files/changed_files*';
+    /**
+     * Read files from generated lists.
+     *
+     * @param string $listsBaseDir
+     * @param string $listFilePattern
+     * @param callable $noListCallback
+     * @return string[]
+     */
+    private static function getFilesFromListFile($listsBaseDir, $listFilePattern, $noListCallback)
+    {
+        $filesDefinedInList = [];
+
+        $globFilesListPattern = ($listsBaseDir ?: self::getChangedFilesBaseDir())
+            . '/_files/' . $listFilePattern;
         $listFiles = glob($globFilesListPattern);
         if (count($listFiles)) {
             foreach ($listFiles as $listFile) {
-                $changedFiles = array_merge(
-                    $changedFiles,
+                $filesDefinedInList = array_merge(
+                    $filesDefinedInList,
                     file($listFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)
                 );
             }
         } else {
-            // if no list files, probably, this is the dev environment
-            @exec('git diff --name-only', $changedFiles);
+            $filesDefinedInList = call_user_func($noListCallback);
         }
 
         array_walk(
-            $changedFiles,
+            $filesDefinedInList,
             function (&$file) {
                 $file = BP . '/' . $file;
             }
         );
 
-        return $changedFiles;
+        $filesDefinedInList = array_values(array_unique($filesDefinedInList));
+
+        return $filesDefinedInList;
     }
 
     /**
@@ -194,7 +248,12 @@ function ($file) use ($fileHasAllowedType, $fileIsInAllowedDirectory) {
      */
     private function getFullWhitelist()
     {
-        return Files::init()->readLists(__DIR__ . '/_files/whitelist/common.txt');
+        try {
+            return Files::init()->readLists(__DIR__ . '/_files/whitelist/common.txt');
+        } catch (\Exception $e) {
+            // nothing is whitelisted
+            return [];
+        }
     }
 
     public function testCodeStyle()
@@ -267,4 +326,42 @@ public function testCopyPaste()
             "PHP Copy/Paste Detector has found error(s):" . PHP_EOL . $output
         );
     }
+
+    /**
+     * Tests whitelisted files for strict type declarations.
+     */
+    public function testStrictTypes()
+    {
+        $changedFiles = self::getAddedFilesList('');
+
+        try {
+            $blackList = Files::init()->readLists(
+                self::getBaseFilesFolder() . '/_files/blacklist/strict_type.txt'
+            );
+        } catch (\Exception $e) {
+            // nothing matched black list
+            $blackList = [];
+        }
+
+        $toBeTestedFiles = array_diff(
+            self::filterFiles($changedFiles, ['php'], []),
+            $blackList
+        );
+
+        $filesMissingStrictTyping = [];
+        foreach ($toBeTestedFiles as $fileName) {
+            $file = file_get_contents($fileName);
+            if (strstr($file, 'strict_types=1') === false) {
+                $filesMissingStrictTyping[] = $fileName;
+            }
+        }
+
+        $this->assertEquals(
+            0,
+            count($filesMissingStrictTyping),
+            "Following files are missing strict type declaration:"
+            . PHP_EOL
+            . implode(PHP_EOL, $filesMissingStrictTyping)
+        );
+    }
 }
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/blacklist/strict_type.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/blacklist/strict_type.txt
new file mode 100644
index 00000000000..877583e5b6a
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/blacklist/strict_type.txt
@@ -0,0 +1 @@
+# Format: <componentType=module|library|theme|language|*> <componentName> <globPattern> or simply <globPattern>
diff --git a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt
index 79c5074caa3..6f4dc68addc 100644
--- a/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Php/_files/whitelist/common.txt
@@ -1,6 +1,5 @@
 # Format: <componentType=module|library|theme|language|*> <componentName> <globPattern> or simply <globPattern>
 * * /
-dev/tools/Magento
 dev/tests
 phpserver
 pub
diff --git a/dev/tools/Magento/Tools/Layout/processors/addItemRenderer.xsl b/dev/tools/Magento/Tools/Layout/processors/addItemRenderer.xsl
deleted file mode 100644
index 2519a007df0..00000000000
--- a/dev/tools/Magento/Tools/Layout/processors/addItemRenderer.xsl
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:php="http://php.net/xsl"
-    xsl:extension-element-prefixes="php"
-    exclude-result-prefixes="xsl php"
->
-    <!-- Copy nodes -->
-    <xsl:template match="node()|@*">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match="action[@method='addItemRender']">
-        <block class="{*[2]}" as="{*[1]}" template="{*[3]}"></block>
-    </xsl:template>
-
-    <xsl:template match="action[@method='addRowItemRender']">
-        <block class="{*[2]}" as="row-{*[1]}" template="{*[3]}"></block>
-    </xsl:template>
-</xsl:stylesheet>
diff --git a/dev/tools/Magento/Tools/Layout/processors/addToParentGroup.xsl b/dev/tools/Magento/Tools/Layout/processors/addToParentGroup.xsl
deleted file mode 100644
index 55ebf482702..00000000000
--- a/dev/tools/Magento/Tools/Layout/processors/addToParentGroup.xsl
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:php="http://php.net/xsl"
-    xsl:extension-element-prefixes="php"
-    exclude-result-prefixes="xsl php"
-    >
-
-    <!-- Copy nodes -->
-    <xsl:template match="node()|@*">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*" />
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match="block[action[@method='addToParentGroup']]">
-        <xsl:copy>
-            <xsl:copy-of select="@*" />
-            <xsl:attribute name="group">
-                <xsl:value-of select="action[@method='addToParentGroup']/*[1]" />
-            </xsl:attribute>
-            <xsl:apply-templates select="*" />
-        </xsl:copy>
-    </xsl:template>
-
-    <!-- Delete action -->
-    <xsl:template match="action[@method='addToParentGroup']">
-    </xsl:template>
-
-</xsl:stylesheet>
diff --git a/dev/tools/Magento/Tools/Layout/processors/headBlocks.xsl b/dev/tools/Magento/Tools/Layout/processors/headBlocks.xsl
deleted file mode 100644
index 03a7f75b238..00000000000
--- a/dev/tools/Magento/Tools/Layout/processors/headBlocks.xsl
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:php="http://php.net/xsl"
-    xsl:extension-element-prefixes="php"
-    exclude-result-prefixes="xsl php"
-    >
-
-    <!-- Copy nodes -->
-    <xsl:template match="node()|@*">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*" />
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match="action[@method='addJs' or @method='addCss']">
-        <block>
-            <xsl:attribute name="class">
-                <xsl:choose>
-                    <xsl:when test="@method = 'addJs' ">Magento\Theme\Block\Html\Head\Script</xsl:when>
-                    <xsl:when test="@method = 'addCss'">Magento\Theme\Block\Html\Head\Css</xsl:when>
-                </xsl:choose>
-            </xsl:attribute>
-            <xsl:attribute name="name">
-                <xsl:value-of select="php:function('strtolower', php:function('trim', php:function('preg_replace', '/[^a-z]+/i', '-', string(./*[1])), '-'))" />
-            </xsl:attribute>
-            <xsl:apply-templates select="@ifconfig" />
-            <arguments>
-                <argument name="file" xsi:type="string">
-                    <xsl:value-of select="*[1]" />
-                </argument>
-                <xsl:if test="count(*[position() &gt; 1])">
-                    <argument name="properties" xsi:type="array">
-                        <xsl:if test="*[2]"><item name="attributes" xsi:type="array"><xsl:value-of select="*[2]" /></item></xsl:if>
-                        <xsl:if test="*[3]"><item name="ie_condition" xsi:type="array"><xsl:value-of select="*[3]" /></item></xsl:if>
-                        <xsl:if test="*[4]"><item name="flag_name" xsi:type="array"><xsl:value-of select="*[4]" /></item></xsl:if>
-                    </argument>
-                </xsl:if>
-            </arguments>
-        </block>
-    </xsl:template>
-
-    <xsl:template match="//reference[action[@method='removeItem']]">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*" />
-        </xsl:copy>
-        <xsl:for-each select="action[@method='removeItem']">
-            <remove name="{php:function('strtolower', php:function('trim', php:function('preg_replace', '/[^a-z]+/i', '-', string(*[2])), '-'))}" />
-        </xsl:for-each>
-      </xsl:template>
-
-    <!-- Delete remove item call -->
-    <xsl:template match="action[@method='removeItem']">
-    </xsl:template>
-
-</xsl:stylesheet>
diff --git a/dev/tools/Magento/Tools/Layout/processors/layoutArguments.xsl b/dev/tools/Magento/Tools/Layout/processors/layoutArguments.xsl
deleted file mode 100644
index 84edd36f43c..00000000000
--- a/dev/tools/Magento/Tools/Layout/processors/layoutArguments.xsl
+++ /dev/null
@@ -1,150 +0,0 @@
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:php="http://php.net/xsl"
-    extension-element-prefixes="php"
-    exclude-result-prefixes="xsl php">
-
-    <xsl:output method="xml" omit-xml-declaration="yes"/>
-
-    <!-- Copy nodes -->
-    <xsl:template match="node()|@*">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <!-- Update block node -->
-    <xsl:template match="block">
-        <xsl:copy>
-            <xsl:attribute name="class">
-                <xsl:value-of select="attribute::type"/>
-            </xsl:attribute>
-            <xsl:apply-templates select="node()|@*[name()!='type']"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <!-- Update action node -->
-    <xsl:template match="*[name()='action']">
-        <xsl:copy>
-            <xsl:apply-templates select="@*" />
-            <xsl:call-template name="argument"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <!-- Update block arguments -->
-    <xsl:template match="arguments">
-        <xsl:element name="arguments">
-            <xsl:call-template name="argument"/>
-        </xsl:element>
-    </xsl:template>
-
-    <xsl:template name="argument">
-        <xsl:for-each select="child::*">
-            <xsl:element name="argument">
-                <xsl:attribute name="name">
-                    <xsl:value-of select="name()" />
-                </xsl:attribute>
-                <xsl:call-template name="type"/>
-            </xsl:element>
-        </xsl:for-each>
-    </xsl:template>
-
-    <!-- Add type attribute -->
-    <xsl:template name="type">
-        <xsl:choose>
-            <xsl:when test="@type='url'">
-                <!-- Type Url-->
-                <xsl:call-template name="url"/>
-            </xsl:when>
-            <xsl:when test="@type = 'options'">
-                <!-- Type options-->
-                <xsl:call-template name="options"/>
-            </xsl:when>
-            <xsl:when test="count(child::*) &gt; 0">
-                <!-- Type Array-->
-                <xsl:call-template name="array"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <!-- Scalar types -->
-                <xsl:attribute name="xsi:type">
-                    <xsl:choose>
-                        <!--<xsl:when test="count(child::*) &gt; 0">array</xsl:when>-->
-                        <xsl:when test="php:function('preg_match', '/^(Mage)_((?!::).)*$/', string(.))=1">object</xsl:when>
-                        <!--<xsl:when test="php:function('preg_match', '/(true|false)/', string(.))=1">boolean</xsl:when>-->
-                        <!--<xsl:when test="php:function('preg_match', '/^[0-9\.\,\+\-]+$/', string(.))=1">number</xsl:when>-->
-                        <!--<xsl:when test="@type='url'">url</xsl:when>-->
-                        <xsl:otherwise>string</xsl:otherwise>
-                    </xsl:choose>
-                </xsl:attribute>
-                <xsl:apply-templates select="node()|@*[name()!='type' and name()!='helper']"/>
-                <!--<xsl:call-template name="helper"/>-->
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <xsl:template name="url">
-        <xsl:attribute name="xsi:type">url</xsl:attribute>
-        <xsl:attribute name="path">
-            <xsl:value-of select="child::path"/>
-        </xsl:attribute>
-        <xsl:for-each select="child::params/*">
-            <xsl:element name="param">
-                <xsl:attribute name="name">
-                    <xsl:value-of select="name()"/>
-                </xsl:attribute>
-                <xsl:apply-templates select="node()|@*"/>
-            </xsl:element>
-        </xsl:for-each>
-    </xsl:template>
-
-    <xsl:template name="array">
-        <xsl:attribute name="xsi:type">array</xsl:attribute>
-        <!--<xsl:call-template name="helper"/>-->
-        <xsl:for-each select="child::*">
-            <xsl:choose>
-                <xsl:when test="name()='updater'">
-                    <!--<xsl:call-template name="updater"/>-->
-                    <xsl:copy>
-                        <xsl:apply-templates select="node()|@*"/>
-                    </xsl:copy>
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:element name="item">
-                        <xsl:attribute name="name">
-                            <xsl:value-of select="name()" />
-                        </xsl:attribute>
-                        <xsl:call-template name="type"/>
-                    </xsl:element>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:for-each>
-    </xsl:template>
-
-    <xsl:template name="options">
-        <xsl:attribute name="xsi:type">options</xsl:attribute>
-        <xsl:choose>
-            <xsl:when test="count(child::*)=0">
-                <xsl:attribute name="model">
-                    <xsl:value-of select="."/>
-                </xsl:attribute>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:for-each select="child::*">
-                    <xsl:element name="item">
-                        <xsl:attribute name="name">
-                            <xsl:value-of select="name()" />
-                        </xsl:attribute>
-                        <xsl:call-template name="type"/>
-                    </xsl:element>
-                </xsl:for-each>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-</xsl:stylesheet>
diff --git a/dev/tools/Magento/Tools/Layout/processors/layoutGridContainer.xsl b/dev/tools/Magento/Tools/Layout/processors/layoutGridContainer.xsl
deleted file mode 100644
index 31473b68d67..00000000000
--- a/dev/tools/Magento/Tools/Layout/processors/layoutGridContainer.xsl
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:php="http://php.net/xsl"
-    extension-element-prefixes="php"
-    exclude-result-prefixes="xsl php">
-
-    <xsl:param name="referencesFile" select="'references.xml'"/>
-    <xsl:variable name="referencesDoc" select="document($referencesFile)"/>
-    <xsl:variable name="conflictNames" select="$referencesDoc/list/item[@type = 'conflictNames']"/>
-
-    <xsl:output method="xml" omit-xml-declaration="yes"/>
-
-    <!-- Copy nodes -->
-    <xsl:template match="node()|@*">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match="container">
-        <xsl:choose>
-            <xsl:when test="@name=$conflictNames/@value">
-                <xsl:element name="block">
-                        <xsl:attribute name="class">
-                            <xsl:value-of select="'Magento\Backend\Block\Widget\Grid\Container'"/>
-                        </xsl:attribute>
-                        <xsl:attribute name="name">
-                            <xsl:value-of select="@name"/>
-                        </xsl:attribute>
-                        <xsl:attribute name="template">
-                            <xsl:value-of select="'Magento_Backend::widget/grid/container/empty.phtml'"/>
-                        </xsl:attribute>
-                        <xsl:apply-templates select="node()|@output"/>
-                </xsl:element>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:copy>
-                    <xsl:apply-templates select="node()|@*"/>
-                </xsl:copy>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-</xsl:stylesheet>
diff --git a/dev/tools/Magento/Tools/Layout/processors/layoutHandles.xsl b/dev/tools/Magento/Tools/Layout/processors/layoutHandles.xsl
deleted file mode 100644
index d30a41a7722..00000000000
--- a/dev/tools/Magento/Tools/Layout/processors/layoutHandles.xsl
+++ /dev/null
@@ -1,57 +0,0 @@
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:php="http://php.net/xsl"
-    extension-element-prefixes="php"
-    exclude-result-prefixes="xsl php">
-
-    <xsl:output method="xml" omit-xml-declaration="yes"/>
-    <!--<xsl:variable name="schemaPath" select="'https://raw.github.com/magento/magento2/master/app/code/Mage/Core/etc/layouts.xsd'"/>-->
-
-    <!-- Copy nodes -->
-    <xsl:template match="node()|@*">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <!-- Update layout (document root) node -->
-    <xsl:template match="layout">
-        <!--<xsl:copy>-->
-            <layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-                <xsl:apply-templates select="@*|node()"/>
-            </layout>
-            <!--<xsl:attribute name="xsi:noNamespaceSchemaLocation">-->
-                <!--<xsl:value-of select="$schemaPath"/>-->
-            <!--</xsl:attribute>-->
-        <!--</xsl:copy>-->
-    </xsl:template>
-
-    <xsl:template match="layout/@version"></xsl:template>
-
-    <!-- Update handle node -->
-    <xsl:template match="*[name(..)='layout']">
-        <xsl:element name="handle">
-            <xsl:attribute name="id">
-                <xsl:value-of select="name()" />
-            </xsl:attribute>
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:element>
-    </xsl:template>
-
-    <!-- Update block node -->
-    <xsl:template match="block[@type]">
-        <xsl:copy>
-            <xsl:attribute name="class">
-                <xsl:value-of select="attribute::type" />
-            </xsl:attribute>
-            <xsl:apply-templates select="node()|@*[name()!='type']"/>
-        </xsl:copy>
-    </xsl:template>
-</xsl:stylesheet>
diff --git a/dev/tools/Magento/Tools/Layout/processors/layoutLabels.xsl b/dev/tools/Magento/Tools/Layout/processors/layoutLabels.xsl
deleted file mode 100644
index e91d6631412..00000000000
--- a/dev/tools/Magento/Tools/Layout/processors/layoutLabels.xsl
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:php="http://php.net/xsl"
-    extension-element-prefixes="php"
-    exclude-result-prefixes="xsl php">
-
-    <xsl:output method="xml" omit-xml-declaration="yes"/>
-    <xsl:variable name="schemaPath" select="'https://raw.github.com/magento/magento2/master/app/code/Mage/Core/etc/layouts.xsd'"/>
-
-    <!-- Copy nodes -->
-    <xsl:template match="node()|@*">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <!-- Transfer handle labels into attributes -->
-    <xsl:template match="*[name(..)='layout' and  ./label]">
-        <xsl:element name="{name(.)}">
-            <xsl:attribute name="label">
-                <xsl:value-of select="./label"/>
-            </xsl:attribute>
-            <xsl:apply-templates select="*[name()!='label']|@*[name()!='translate']"/>
-        </xsl:element>
-    </xsl:template>
-</xsl:stylesheet>
diff --git a/dev/tools/Magento/Tools/Layout/processors/layoutReferences.xsl b/dev/tools/Magento/Tools/Layout/processors/layoutReferences.xsl
deleted file mode 100644
index f7326458079..00000000000
--- a/dev/tools/Magento/Tools/Layout/processors/layoutReferences.xsl
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:php="http://php.net/xsl"
-    extension-element-prefixes="php"
-    exclude-result-prefixes="xsl php">
-
-    <xsl:param name="referencesFile" select="'references.xml'"/>
-    <xsl:variable name="referencesDoc" select="document($referencesFile)"/>
-    <xsl:variable name="blocks" select="$referencesDoc/list/item[@type = 'block']"/>
-    <xsl:variable name="containers" select="$referencesDoc/list/item[@type = 'container']"/>
-    <xsl:variable name="conflictNames" select="$referencesDoc/list/item[@type = 'conflictNames']"/>
-
-    <xsl:output method="xml" omit-xml-declaration="yes"/>
-
-    <!-- Copy nodes -->
-    <xsl:template match="node()|@*">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match="reference">
-        <xsl:choose>
-            <xsl:when test="@name=$conflictNames/@value">
-                <xsl:copy>
-                    <xsl:apply-templates select="node()|@*"/>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:when test="@name=$blocks/@value">
-                <xsl:element name="referenceBlock">
-                    <xsl:apply-templates select="node()|@*"/>
-                </xsl:element>
-            </xsl:when>
-            <xsl:when test="@name=$containers/@value">
-                <xsl:element name="referenceContainer">
-                    <xsl:apply-templates select="node()|@*"/>
-                </xsl:element>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:copy>
-                    <xsl:apply-templates select="node()|@*"/>
-                </xsl:copy>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-</xsl:stylesheet>
diff --git a/dev/tools/Magento/Tools/Layout/processors/layoutTranslate.xsl b/dev/tools/Magento/Tools/Layout/processors/layoutTranslate.xsl
deleted file mode 100644
index dcf54d062d7..00000000000
--- a/dev/tools/Magento/Tools/Layout/processors/layoutTranslate.xsl
+++ /dev/null
@@ -1,77 +0,0 @@
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:php="http://php.net/xsl"
-    extension-element-prefixes="php"
-    exclude-result-prefixes="xsl php">
-
-    <xsl:output method="xml" omit-xml-declaration="yes"/>
-    <xsl:variable name="schemaPath" select="'https://raw.github.com/magento/magento2/master/app/code/Mage/Core/etc/layouts.xsd'"/>
-
-    <!-- Copy nodes -->
-    <xsl:template match="node()|@*">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <!-- Remove translate attribute attribute -->
-    <xsl:template match="@translate[.!='true']">
-        <xsl:apply-templates select="node()"/>
-    </xsl:template>
-
-    <!-- Move translate attribute to exact node -->
-    <xsl:template match="*[../@translate]">
-        <xsl:variable name="translate" select="../@translate"/>
-        <xsl:choose>
-            <xsl:when test="@name=$translate">
-                <xsl:copy>
-                    <xsl:attribute name="translate">true</xsl:attribute>
-                    <xsl:apply-templates select="node()|@*"/>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:when test="contains($translate, ' ')">
-                <xsl:call-template name="tokenize">
-                    <xsl:with-param name="translate" select="$translate" />
-                    <xsl:with-param name="separator" select="' '" />
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:copy>
-                    <xsl:apply-templates select="node()|@*"/>
-                </xsl:copy>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-
-    <!-- Subroutine for translate it it contains separator -->
-    <xsl:template name="tokenize">
-        <xsl:param name="translate"/>
-        <xsl:param name="separator"/>
-        <xsl:variable name="first-item" select="normalize-space(substring-before(concat($translate, $separator), $separator))" />
-        <xsl:choose>
-            <xsl:when test="$first-item=@name">
-                <xsl:copy>
-                    <xsl:attribute name="translate">true</xsl:attribute>
-                    <xsl:apply-templates select="node()|@*"/>
-                </xsl:copy>
-            </xsl:when>
-            <xsl:when test="$first-item">
-                <xsl:call-template name="tokenize">
-                    <xsl:with-param name="translate" select="substring-after($translate, $separator)" />
-                    <xsl:with-param name="separator" select="$separator" />
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:copy>
-                    <xsl:apply-templates select="node()|@*"/>
-                </xsl:copy>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:template>
-</xsl:stylesheet>
diff --git a/dev/tools/Magento/Tools/psr/phpcs_precommit_hook.sh b/dev/tools/Magento/Tools/psr/phpcs_precommit_hook.sh
deleted file mode 100755
index 229fb53f254..00000000000
--- a/dev/tools/Magento/Tools/psr/phpcs_precommit_hook.sh
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/bash
-# PHP CodeSniffer pre-commit hook for git
-#
- 
-PHPCS_BIN=/usr/bin/phpcs
-PHPCS_CODING_STANDARD=PSR2
-PHPCS_MEMORY_LIMIT=1024M
-PHPCS_IGNORE=
-PHPCS_EXTENSIONS=php,phtml
-PHPCS_ENCODING=utf-8
-TMP_STAGING=".tmp"
- 
-# simple check if code sniffer is set up correctly
-if [ ! -x $PHPCS_BIN ]; then
-    echo "PHP Code Sniffer is not available: $PHPCS_BIN"
-    exit 1
-fi
-
-# if HEAD is available for comparison, otherwise use an empty tree object
-if git rev-parse --verify HEAD
-then
-    against=HEAD
-else
-    # Initial commit: diff against an empty tree object
-    against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
-fi
-
-FILES=$(git diff-index --name-only --cached --diff-filter=ACMR $against -- )
- 
-if [ "$FILES" == "" ]; then
-    exit 0
-fi
-
-# create temporary copy of staging area
-if [ -e $TMP_STAGING ]; then
-    rm -rf $TMP_STAGING
-fi
-mkdir $TMP_STAGING
-
-# match files against whitelist
-FILES_TO_CHECK=""
-for FILE in $FILES
-do
-    echo "$FILE" | egrep -q "$PHPCS_FILE_PATTERN"
-    RETVAL=$?
-    if [ "$RETVAL" -eq "0" ]
-    then
-        FILES_TO_CHECK="$FILES_TO_CHECK $FILE"
-    fi
-done
- 
-if [ "$FILES_TO_CHECK" == "" ]; then
-    exit 0
-fi
-# execute the code sniffer
-if [ "$PHPCS_IGNORE" != "" ]; then
-    IGNORE="--ignore=$PHPCS_IGNORE"
-else
-    IGNORE=""
-fi
- 
-if [ "$PHPCS_ENCODING" != "" ]; then
-    ENCODING="--encoding=$PHPCS_ENCODING"
-else
-    ENCODING=""
-fi
- 
-if [ "$PHPCS_IGNORE_WARNINGS" == "1" ]; then
-    IGNORE_WARNINGS="-n"
-else
-    IGNORE_WARNINGS=""
-fi
-
-# Copy staged files to a processing folder
-STAGED_FILES=""
-
-for FILE in $FILES_TO_CHECK
-do
-  ID=`git diff-index --cached HEAD -- $FILE | cut -d " " -f4`
-
-  # create staged version of file in temporary staging area with the same
-  # path as the original file so that the phpcs ignore filters can be applied
-  mkdir -p "$TMP_STAGING/$(dirname $FILE)"
-
-  git cat-file blob $ID > "$TMP_STAGING/$FILE"
-  STAGED_FILES="$STAGED_FILES $TMP_STAGING/$FILE"
-
-done
- 
-OUTPUT=$($PHPCS_BIN -n -s $IGNORE_WARNINGS  --standard=$PHPCS_CODING_STANDARD -d memory_limit=$PHPCS_MEMORY_LIMIT $ENCODING --extensions=$PHPCS_EXTENSIONS $IGNORE $STAGED_FILES)
-RETVAL=$?
-
-# delete temporary copy of staging area
-rm -rf $TMP_STAGING
- 
-if [ $RETVAL -ne 0 ]; then
-    echo "Error Committing Files to Repository.  PHP Code Sniffer errors detected:"
-    echo ""
-    echo ""
-    echo "$OUTPUT"
-fi
-
-exit $RETVAL
diff --git a/dev/travis/before_install.sh b/dev/travis/before_install.sh
index 63e1059f18a..c9302f3b667 100755
--- a/dev/travis/before_install.sh
+++ b/dev/travis/before_install.sh
@@ -21,7 +21,7 @@ phpenv rehash;
 test -n "$GITHUB_TOKEN" && composer config github-oauth.github.com "$GITHUB_TOKEN" || true
 
 # Node.js setup via NVM
-if [ test $TEST_SUITE == "js" ]; then
+if [ $TEST_SUITE == "js" ]; then
     curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.1/install.sh | bash
     export NVM_DIR="$HOME/.nvm"
     [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm
diff --git a/lib/internal/Magento/Framework/Amqp/composer.json b/lib/internal/Magento/Framework/Amqp/composer.json
index 2fa84f7ed3e..f92b3ec22cb 100644
--- a/lib/internal/Magento/Framework/Amqp/composer.json
+++ b/lib/internal/Magento/Framework/Amqp/composer.json
@@ -13,7 +13,7 @@
     "require": {
         "magento/framework": "100.3.*",
         "php": "~7.1.3||~7.2.0",
-        "php-amqplib/php-amqplib": "2.5.*"
+        "php-amqplib/php-amqplib": "~2.7.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/lib/internal/Magento/Framework/Api/ExtensionAttributesFactory.php b/lib/internal/Magento/Framework/Api/ExtensionAttributesFactory.php
index e1a4431783d..01c09a160ae 100644
--- a/lib/internal/Magento/Framework/Api/ExtensionAttributesFactory.php
+++ b/lib/internal/Magento/Framework/Api/ExtensionAttributesFactory.php
@@ -88,6 +88,7 @@ public function getExtensibleInterfaceName($extensibleClassName)
         $exceptionMessage = "Class '{$extensibleClassName}' must implement an interface, "
             . "which extends from '" . self::EXTENSIBLE_INTERFACE_NAME . "'";
         $notExtensibleClassFlag = '';
+
         if (isset($this->classInterfaceMap[$extensibleClassName])) {
             if ($notExtensibleClassFlag === $this->classInterfaceMap[$extensibleClassName]) {
                 throw new \LogicException($exceptionMessage);
diff --git a/lib/internal/Magento/Framework/App/Cache/Frontend/Factory.php b/lib/internal/Magento/Framework/App/Cache/Frontend/Factory.php
index 0e7ac7527cc..e8eca51aad9 100644
--- a/lib/internal/Magento/Framework/App/Cache/Frontend/Factory.php
+++ b/lib/internal/Magento/Framework/App/Cache/Frontend/Factory.php
@@ -71,7 +71,6 @@ class Factory
      */
     protected $_backendOptions = [
         'hashed_directory_level' => 1,
-        'hashed_directory_umask' => 0777,
         'file_name_prefix' => 'mage',
     ];
 
diff --git a/lib/internal/Magento/Framework/App/Config/Storage/WriterInterface.php b/lib/internal/Magento/Framework/App/Config/Storage/WriterInterface.php
index 308c7656d5e..35b24692bd2 100644
--- a/lib/internal/Magento/Framework/App/Config/Storage/WriterInterface.php
+++ b/lib/internal/Magento/Framework/App/Config/Storage/WriterInterface.php
@@ -11,7 +11,7 @@
 
 /**
  * Interface \Magento\Framework\App\Config\Storage\WriterInterface
- *
+ * @api
  */
 interface WriterInterface
 {
diff --git a/lib/internal/Magento/Framework/Bulk/OperationInterface.php b/lib/internal/Magento/Framework/Bulk/OperationInterface.php
index c6d714b0363..4b626ac6596 100644
--- a/lib/internal/Magento/Framework/Bulk/OperationInterface.php
+++ b/lib/internal/Magento/Framework/Bulk/OperationInterface.php
@@ -19,6 +19,7 @@ interface OperationInterface
     const BULK_ID = 'bulk_uuid';
     const TOPIC_NAME = 'topic_name';
     const SERIALIZED_DATA = 'serialized_data';
+    const RESULT_SERIALIZED_DATA = 'result_serialized_data';
     const STATUS = 'status';
     const RESULT_MESSAGE = 'result_message';
     const ERROR_CODE = 'error_code';
@@ -31,6 +32,7 @@ interface OperationInterface
     const STATUS_TYPE_RETRIABLY_FAILED = 2;
     const STATUS_TYPE_NOT_RETRIABLY_FAILED = 3;
     const STATUS_TYPE_OPEN = 4;
+    const STATUS_TYPE_REJECTED = 5;
     /**#@-*/
 
     /**
@@ -101,6 +103,23 @@ public function getSerializedData();
      */
     public function setSerializedData($serializedData);
 
+    /**
+     * Result serialized Data
+     *
+     * @return string
+     * @since 100.3.0
+     */
+    public function getResultSerializedData();
+
+    /**
+     * Set result serialized data
+     *
+     * @param string $resultSerializedData
+     * @return $this
+     * @since 100.3.0
+     */
+    public function setResultSerializedData($resultSerializedData);
+
     /**
      * Get operation status
      *
diff --git a/lib/internal/Magento/Framework/Config/Dom.php b/lib/internal/Magento/Framework/Config/Dom.php
index 2fbd814139a..1d995bab007 100644
--- a/lib/internal/Magento/Framework/Config/Dom.php
+++ b/lib/internal/Magento/Framework/Config/Dom.php
@@ -277,7 +277,10 @@ protected function _getMatchedNode($nodePath)
         $node = null;
         if ($matchedNodes->length > 1) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                new \Magento\Framework\Phrase("More than one node matching the query: %1", [$nodePath])
+                new \Magento\Framework\Phrase(
+                    "More than one node matching the query: %1, Xml is: %2",
+                    [$nodePath, $this->dom->saveXML()]
+                )
             );
         } elseif ($matchedNodes->length == 1) {
             $node = $matchedNodes->item(0);
diff --git a/lib/internal/Magento/Framework/DB/Sql/ConcatExpression.php b/lib/internal/Magento/Framework/DB/Sql/ConcatExpression.php
index a0c3a803ca0..490e272d1a6 100644
--- a/lib/internal/Magento/Framework/DB/Sql/ConcatExpression.php
+++ b/lib/internal/Magento/Framework/DB/Sql/ConcatExpression.php
@@ -65,7 +65,7 @@ public function __toString()
         }
         return sprintf(
             'TRIM(%s)',
-            $this->adapter->getConcatSql($columns, ' ')
+            $this->adapter->getConcatSql($columns, $this->separator)
         );
     }
 }
diff --git a/lib/internal/Magento/Framework/DB/Tree/NodeSet.php b/lib/internal/Magento/Framework/DB/Tree/NodeSet.php
index 52d67398303..46a2497a834 100644
--- a/lib/internal/Magento/Framework/DB/Tree/NodeSet.php
+++ b/lib/internal/Magento/Framework/DB/Tree/NodeSet.php
@@ -9,7 +9,7 @@
  * TODO implements iterators
  *
  */
-class NodeSet implements \Iterator
+class NodeSet implements \Iterator, \Countable
 {
     /**
      * @var Node[]
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Collection.php b/lib/internal/Magento/Framework/Data/Form/Element/Collection.php
index 7a544501861..ced1f420822 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Collection.php
@@ -13,7 +13,7 @@
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Collection implements \ArrayAccess, \IteratorAggregate
+class Collection implements \ArrayAccess, \IteratorAggregate, \Countable
 {
     /**
      * Elements storage
diff --git a/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php b/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php
index 832fd18b486..94990c0340a 100644
--- a/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php
+++ b/lib/internal/Magento/Framework/Data/Tree/Node/Collection.php
@@ -17,7 +17,7 @@
 /**
  * @api
  */
-class Collection implements \ArrayAccess, \IteratorAggregate
+class Collection implements \ArrayAccess, \IteratorAggregate, \Countable
 {
     /**
      * @var array
diff --git a/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php b/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
index 0b92e640713..92a85051129 100644
--- a/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
+++ b/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
@@ -78,6 +78,13 @@ public function addError(Phrase $phrase)
         return $this;
     }
 
+    public function addException(LocalizedException $exception)
+    {
+        $this->addErrorCalls++;
+        $this->errors[] = $exception;
+        return $this;
+    }
+
     /**
      * Should return true if someone has added different errors to this exception after construction
      *
diff --git a/lib/internal/Magento/Framework/Exception/BulkException.php b/lib/internal/Magento/Framework/Exception/BulkException.php
new file mode 100644
index 00000000000..b2e91da211f
--- /dev/null
+++ b/lib/internal/Magento/Framework/Exception/BulkException.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Exception;
+
+use Magento\Framework\Phrase;
+
+/**
+ * Exception thrown while processing bulk of entities
+ *
+ * @api
+ */
+class BulkException extends AbstractAggregateException
+{
+    /**
+     * @var array
+     */
+    private $data;
+
+    /**
+     * Exception thrown while processing bulk of entities
+     *
+     * It is capable of holding both successfully processed entities and failed entities.
+     * Client can decide how to handle the information
+     *
+     * @param \Magento\Framework\Phrase $phrase
+     * @param \Exception $cause
+     * @param int $code
+     */
+    public function __construct(Phrase $phrase = null, \Exception $cause = null, $code = 0)
+    {
+        if ($phrase === null) {
+            $phrase = new Phrase('One or more input exceptions have occurred while processing bulk.');
+        }
+        parent::__construct($phrase, $cause, $code);
+    }
+
+    /**
+     * @param $data array
+     */
+    public function addData($data)
+    {
+        $this->data = $data;
+    }
+
+    /**
+     * @return array
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
+}
diff --git a/lib/internal/Magento/Framework/File/Uploader.php b/lib/internal/Magento/Framework/File/Uploader.php
index 07de9941271..67d7d4bb558 100644
--- a/lib/internal/Magento/Framework/File/Uploader.php
+++ b/lib/internal/Magento/Framework/File/Uploader.php
@@ -534,7 +534,7 @@ private function _setUploadFileId($fileId)
 
             preg_match("/^(.*?)\[(.*?)\]$/", $fileId, $file);
 
-            if (count($file) > 0 && count($file[0]) > 0 && count($file[1]) > 0) {
+            if (is_array($file) && count($file) > 0 && count($file[0]) > 0 && count($file[1]) > 0) {
                 array_shift($file);
                 $this->_uploadType = self::MULTIPLE_STYLE;
 
@@ -547,7 +547,7 @@ private function _setUploadFileId($fileId)
 
                 $fileAttributes = $tmpVar;
                 $this->_file = $fileAttributes;
-            } elseif (count($fileId) > 0 && isset($_FILES[$fileId])) {
+            } elseif (!empty($fileId) && isset($_FILES[$fileId])) {
                 $this->_uploadType = self::SINGLE_STYLE;
                 $this->_file = $_FILES[$fileId];
             } elseif ($fileId == '') {
diff --git a/lib/internal/Magento/Framework/HTTP/ClientInterface.php b/lib/internal/Magento/Framework/HTTP/ClientInterface.php
index 643f298ef4c..e2e4a89af8f 100644
--- a/lib/internal/Magento/Framework/HTTP/ClientInterface.php
+++ b/lib/internal/Magento/Framework/HTTP/ClientInterface.php
@@ -99,7 +99,7 @@ public function get($uri);
      * Make POST request
      *
      * @param string $uri full uri
-     * @param array $params POST fields array
+     * @param array|string $params POST fields array or string in case of JSON or XML data
      * @return void
      */
     public function post($uri, $params);
diff --git a/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php b/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
index a32561704d1..6042e4eee49 100644
--- a/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
+++ b/lib/internal/Magento/Framework/Image/Adapter/AbstractAdapter.php
@@ -301,9 +301,12 @@ public function getImageType()
         if ($this->_fileType) {
             return $this->_fileType;
         } else {
-            list($this->_imageSrcWidth, $this->_imageSrcHeight, $this->_fileType) = getimagesize($this->_fileName);
-            return $this->_fileType;
+            if ($this->_canProcess()) {
+                list($this->_imageSrcWidth, $this->_imageSrcHeight, $this->_fileType) = getimagesize($this->_fileName);
+                return $this->_fileType;
+            }
         }
+        return null;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Indexer/Dimension.php b/lib/internal/Magento/Framework/Indexer/Dimension.php
new file mode 100644
index 00000000000..4cb74003c46
--- /dev/null
+++ b/lib/internal/Magento/Framework/Indexer/Dimension.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Indexer;
+
+/**
+ * Index Dimension object
+ *
+ * @api
+ */
+class Dimension
+{
+    /**
+     * @param string $name
+     * @param string $value
+     */
+    public function __construct(string $name, string $value)
+    {
+        $this->name = $name;
+        $this->value = $value;
+    }
+
+    /**
+     * Get dimension name
+     *
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get dimension value
+     *
+     * @return string
+     */
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Indexer/Dimension/DimensionProviderInterface.php b/lib/internal/Magento/Framework/Indexer/Dimension/DimensionProviderInterface.php
new file mode 100644
index 00000000000..e2d05b2ae03
--- /dev/null
+++ b/lib/internal/Magento/Framework/Indexer/Dimension/DimensionProviderInterface.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Indexer\Dimension;
+
+/**
+ * @api
+ * Provide a list of dimensions
+ */
+interface DimensionProviderInterface extends \IteratorAggregate
+{
+    /**
+     * Get Dimension Iterator. Returns yielded value of \Magento\Framework\Indexer\Dimension
+     * @return \Traversable|\Magento\Framework\Indexer\Dimension[]
+     */
+    public function getIterator(): \Traversable;
+}
diff --git a/lib/internal/Magento/Framework/Indexer/Dimension/DimensionalIndexerInterface.php b/lib/internal/Magento/Framework/Indexer/Dimension/DimensionalIndexerInterface.php
new file mode 100644
index 00000000000..e2f68272565
--- /dev/null
+++ b/lib/internal/Magento/Framework/Indexer/Dimension/DimensionalIndexerInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Indexer\Dimension;
+
+/**
+ * @api
+ * Run indexer by specific dimension
+ */
+interface DimensionalIndexerInterface
+{
+    /**
+     * Execute indexer by specified dimension.
+     * Accept array of dimensions DTO that represent indexer dimension
+     *
+     * @param \Magento\Framework\Indexer\Dimension[] $dimension
+     * @param \Traversable|null $entityIds
+     * @return void
+     */
+    public function executeByDimension(array $dimension, \Traversable $entityIds = null);
+}
diff --git a/lib/internal/Magento/Framework/Indexer/DimensionFactory.php b/lib/internal/Magento/Framework/Indexer/DimensionFactory.php
new file mode 100644
index 00000000000..a137e2d0e94
--- /dev/null
+++ b/lib/internal/Magento/Framework/Indexer/DimensionFactory.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Indexer;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Dimension Factory
+ *
+ * @api
+ */
+class DimensionFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * @param string $name
+     * @param string $value
+     * @return Dimension
+     */
+    public function create(string $name, $value): Dimension
+    {
+        return $this->objectManager->create(Dimension::class, [
+            'name' => $name,
+            'value' => (string) $value,
+        ]);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Indexer/IndexerInterface.php b/lib/internal/Magento/Framework/Indexer/IndexerInterface.php
index c0e6416b826..bf572b94ccc 100644
--- a/lib/internal/Magento/Framework/Indexer/IndexerInterface.php
+++ b/lib/internal/Magento/Framework/Indexer/IndexerInterface.php
@@ -9,6 +9,8 @@
  * Indexer
  *
  * @api
+ * @deprecated Facade will be split
+ * @see \Magento\Framework\Indexer\ActionInterface
  */
 interface IndexerInterface
 {
@@ -161,6 +163,8 @@ public function getLatestUpdated();
      *
      * @return void
      * @throws \Exception
+     * @deprecated
+     * @see \Magento\Framework\Indexer\ActionInterface::executeFull
      */
     public function reindexAll();
 
@@ -169,6 +173,8 @@ public function reindexAll();
      *
      * @param int $id
      * @return void
+     * @deprecated
+     * @see \Magento\Framework\Indexer\ActionInterface::executeList
      */
     public function reindexRow($id);
 
@@ -177,6 +183,8 @@ public function reindexRow($id);
      *
      * @param int[] $ids
      * @return void
+     * @deprecated
+     * @see \Magento\Framework\Indexer\ActionInterface::executeList
      */
     public function reindexList($ids);
 }
diff --git a/lib/internal/Magento/Framework/Locale/Config.php b/lib/internal/Magento/Framework/Locale/Config.php
index 2a623deca08..f17694a35b0 100644
--- a/lib/internal/Magento/Framework/Locale/Config.php
+++ b/lib/internal/Magento/Framework/Locale/Config.php
@@ -74,6 +74,7 @@ class Config implements \Magento\Framework\Locale\ConfigInterface
         'lv_LV', /*Latvian (Latvia)*/
         'mk_MK', /*Macedonian (Macedonia)*/
         'mn_Cyrl_MN', /*Mongolian (Mongolia)*/
+        'ms_MY', /*Malaysian (Malaysia)*/
         'ms_Latn_MY', /*Malaysian (Malaysia)*/
         'nl_BE', /*Dutch (Belgium)*/
         'nl_NL', /*Dutch (Netherlands)*/
diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageValidator.php b/lib/internal/Magento/Framework/MessageQueue/MessageValidator.php
index 9bc519fc87e..a40bb9af1e0 100644
--- a/lib/internal/Magento/Framework/MessageQueue/MessageValidator.php
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageValidator.php
@@ -173,6 +173,8 @@ protected function validateClassType($message, $messageType, $topic)
     private function getRealType($message)
     {
         $type = is_object($message) ? get_class($message) : gettype($message);
+        $type = $type == 'boolean' ? 'bool' : $type;
+        $type = $type == 'double' ? 'float' : $type;
         return $type == "integer" ? "int" : $type;
     }
 
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/PredefinedId.php b/lib/internal/Magento/Framework/Model/ResourceModel/PredefinedId.php
new file mode 100644
index 00000000000..ca9f1c72c06
--- /dev/null
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/PredefinedId.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Model\ResourceModel;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Model\AbstractModel;
+
+/**
+ * Provides possibility of saving entity with predefined/pre-generated id
+ *
+ * The choice to use trait instead of inheritance was made to prevent the introduction of new layer super type on
+ * the module basis as well as better code reusability, as potentially current trait not coupled to Inventory module
+ * and other modules could re-use this approach.
+ */
+trait PredefinedId
+{
+    /**
+     * Overwrite default \Magento\Framework\Model\ResourceModel\Db\AbstractDb implementation of the isObjectNew
+     * @see \Magento\Framework\Model\ResourceModel\Db\AbstractDb::isObjectNew()
+     *
+     * Adding the possibility to check whether record already exists in DB or not
+     *
+     * @param AbstractModel $object
+     * @return bool
+     */
+    protected function isObjectNotNew(AbstractModel $object)
+    {
+        $connection = $this->getConnection();
+        $select = $connection->select()
+            ->from($this->getMainTable(), [$this->getIdFieldName()])
+            ->where($this->getIdFieldName() . ' = ?', $object->getId())
+            ->limit(1);
+        return (bool)$connection->fetchOne($select);
+    }
+
+    /**
+     * Save New Object
+     *
+     * Overwrite default \Magento\Framework\Model\ResourceModel\Db\AbstractDb implementation of the saveNewObject
+     * @see \Magento\Framework\Model\ResourceModel\Db\AbstractDb::saveNewObject()
+     *
+     * @param \Magento\Framework\Model\AbstractModel $object
+     * @throws LocalizedException
+     * @return void
+     */
+    protected function saveNewObject(\Magento\Framework\Model\AbstractModel $object)
+    {
+        $bind = $this->_prepareDataForSave($object);
+        $this->getConnection()->insert($this->getMainTable(), $bind);
+
+        if ($this->_isPkAutoIncrement) {
+            $object->setId($this->getConnection()->lastInsertId($this->getMainTable()));
+        }
+
+        if ($this->_useIsObjectNew) {
+            $object->isObjectNew(false);
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/Alias.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/Alias.php
new file mode 100644
index 00000000000..9b7e2f3dde9
--- /dev/null
+++ b/lib/internal/Magento/Framework/MultiDimensionalIndexer/Alias.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\MultiDimensionalIndexer;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+
+/**
+ * Index Alias object
+ *
+ * @api
+ */
+class Alias
+{
+    /**
+     * Replica index alias
+     */
+    const ALIAS_REPLICA = 'replica';
+
+    /**
+     * Main index alias
+     */
+    const ALIAS_MAIN = 'main';
+
+    /**
+     * One of self::ALIAS_*
+     *
+     * @var string
+     */
+    private $value;
+
+    /**
+     * @param string $value One of self::ALIAS_*
+     * @throws LocalizedException
+     */
+    public function __construct(string $value)
+    {
+        if ($value !== self::ALIAS_REPLICA && $value !== self::ALIAS_MAIN) {
+            throw new LocalizedException(new Phrase('Wrong value %value for alias', ['value' => $value]));
+        }
+        $this->value = $value;
+    }
+
+    /**
+     * @return string One of self::ALIAS_*
+     */
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/AliasFactory.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/AliasFactory.php
new file mode 100644
index 00000000000..aa65736bca8
--- /dev/null
+++ b/lib/internal/Magento/Framework/MultiDimensionalIndexer/AliasFactory.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\MultiDimensionalIndexer;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Alias Factory
+ *
+ * @api
+ */
+class AliasFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * @param array $arguments
+     * @return Alias
+     */
+    public function create(array $arguments = []): Alias
+    {
+        return $this->objectManager->create(Alias::class, $arguments);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/Dimension.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/Dimension.php
new file mode 100644
index 00000000000..7cfafcf8c70
--- /dev/null
+++ b/lib/internal/Magento/Framework/MultiDimensionalIndexer/Dimension.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\MultiDimensionalIndexer;
+
+use Magento\Framework\Search\AbstractKeyValuePair;
+
+/**
+ * Index Dimension object
+ *
+ * @api
+ */
+class Dimension extends AbstractKeyValuePair
+{
+}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/DimensionFactory.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/DimensionFactory.php
new file mode 100644
index 00000000000..4085341108a
--- /dev/null
+++ b/lib/internal/Magento/Framework/MultiDimensionalIndexer/DimensionFactory.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\MultiDimensionalIndexer;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Dimension Factory
+ *
+ * @api
+ */
+class DimensionFactory
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * @param array $arguments
+     * @return Dimension
+     */
+    public function create(array $arguments = []): Dimension
+    {
+        return $this->objectManager->create(Dimension::class, $arguments);
+    }
+}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexHandlerInterface.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexHandlerInterface.php
new file mode 100644
index 00000000000..8a0eb364d20
--- /dev/null
+++ b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexHandlerInterface.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\MultiDimensionalIndexer;
+
+/**
+ * Represents manipulation with index data
+ *
+ * @api
+ */
+interface IndexHandlerInterface
+{
+    /**
+     * Add data to index
+     *
+     * @param IndexName $indexName
+     * @param \Traversable $documents
+     * @param string $connectionName
+     * @return void
+     */
+    public function saveIndex(IndexName $indexName, \Traversable $documents, string $connectionName);
+
+    /**
+     * Remove given documents from Index
+     *
+     * @param IndexName $indexName
+     * @param \Traversable $documents
+     * @param string $connectionName
+     * @return void
+     */
+    public function cleanIndex(IndexName $indexName, \Traversable $documents, string $connectionName);
+}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexName.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexName.php
new file mode 100644
index 00000000000..2af1f09b81e
--- /dev/null
+++ b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexName.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\MultiDimensionalIndexer;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Phrase;
+
+/**
+ * Index Name object
+ *
+ * @api
+ */
+class IndexName
+{
+    /**
+     * @var string
+     */
+    private $indexId;
+
+    /**
+     * @var Dimension[]
+     */
+    private $dimensions;
+
+    /**
+     * @var Alias
+     */
+    private $alias;
+
+    /**
+     * @param string $indexId
+     * @param Dimension[] $dimensions
+     * @param Alias $alias
+     *
+     * @throws LocalizedException
+     */
+    public function __construct(string $indexId, array $dimensions, Alias $alias)
+    {
+        foreach ($dimensions as $dimension) {
+            if (!$dimension instanceof Dimension) {
+                throw new LocalizedException(
+                    new Phrase('Dimension have to be instance of Dimension class.')
+                );
+            }
+        }
+
+        $this->indexId = $indexId;
+        $this->dimensions = $dimensions;
+        $this->alias = $alias;
+    }
+
+    /**
+     * @return string
+     */
+    public function getIndexId(): string
+    {
+        return $this->indexId;
+    }
+
+    /**
+     * @return Dimension[]
+     */
+    public function getDimensions(): array
+    {
+        return $this->dimensions;
+    }
+
+    /**
+     * @return Alias
+     */
+    public function getAlias(): Alias
+    {
+        return $this->alias;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexNameBuilder.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexNameBuilder.php
new file mode 100644
index 00000000000..901b3d51d37
--- /dev/null
+++ b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexNameBuilder.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\MultiDimensionalIndexer;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Index Name builder. It is Facade for simplifying IndexName object creation
+ *
+ * @api
+ */
+class IndexNameBuilder
+{
+    /**
+     * Index id parameter name. Used internally in this object
+     */
+    private static $indexId = 'indexId';
+
+    /**
+     * Dimensions parameter name. Used internally in this object
+     */
+    private static $dimensions = 'dimensions';
+
+    /**
+     * Alias parameter name. Used internally in this object
+     */
+    private static $alias = 'alias';
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var DimensionFactory
+     */
+    private $dimensionFactory;
+
+    /**
+     * @var AliasFactory
+     */
+    private $aliasFactory;
+
+    /**
+     * @var array
+     */
+    private $data = [];
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param DimensionFactory $dimensionFactory
+     * @param AliasFactory $aliasFactory
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        DimensionFactory $dimensionFactory,
+        AliasFactory $aliasFactory
+    ) {
+        $this->objectManager = $objectManager;
+        $this->dimensionFactory = $dimensionFactory;
+        $this->aliasFactory = $aliasFactory;
+    }
+
+    /**
+     * @param string $indexId
+     * @return self
+     */
+    public function setIndexId(string $indexId): self
+    {
+        $this->data[self::$indexId] = $indexId;
+        return $this;
+    }
+
+    /**
+     * @param string $name
+     * @param string $value
+     * @return self
+     */
+    public function addDimension(string $name, string $value): self
+    {
+        $this->data[self::$dimensions][] = $this->dimensionFactory->create([
+            'name' => $name,
+            'value' => $value,
+        ]);
+        return $this;
+    }
+
+    /**
+     * @param string $alias
+     * @return self
+     */
+    public function setAlias(string $alias): self
+    {
+        $this->data[self::$alias] = $this->aliasFactory->create(['value' => $alias]);
+        return $this;
+    }
+
+    /**
+     * @return IndexName
+     */
+    public function build(): IndexName
+    {
+        $indexName = $this->objectManager->create(IndexName::class, $this->data);
+        $this->data = [];
+        return $indexName;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexNameResolver.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexNameResolver.php
new file mode 100644
index 00000000000..c96c78b9765
--- /dev/null
+++ b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexNameResolver.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\MultiDimensionalIndexer;
+
+use Magento\Framework\Search\Request\IndexScopeResolverInterface;
+
+/**
+ * @inheritdoc
+ */
+class IndexNameResolver implements IndexNameResolverInterface
+{
+    /**
+     * Suffix for replica index table
+     *
+     * @var string
+     */
+    private $additionalTableSuffix = '_replica';
+
+    /**
+     * @var IndexScopeResolverInterface
+     */
+    private $indexScopeResolver;
+
+    /**
+     * @param IndexScopeResolverInterface $indexScopeResolver
+     */
+    public function __construct(
+        IndexScopeResolverInterface $indexScopeResolver
+    ) {
+        $this->indexScopeResolver = $indexScopeResolver;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolveName(IndexName $indexName): string
+    {
+        $tableName = $this->indexScopeResolver->resolve($indexName->getIndexId(), $indexName->getDimensions());
+
+        if ($indexName->getAlias()->getValue() === Alias::ALIAS_REPLICA) {
+            $tableName = $this->getAdditionalTableName($tableName);
+        }
+        return $tableName;
+    }
+
+    /**
+     * @param string $tableName
+     * @return string
+     */
+    public function getAdditionalTableName(string $tableName): string
+    {
+        return $tableName . $this->additionalTableSuffix;
+    }
+}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexNameResolverInterface.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexNameResolverInterface.php
new file mode 100644
index 00000000000..9068acd3373
--- /dev/null
+++ b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexNameResolverInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\MultiDimensionalIndexer;
+
+/**
+ * Resolve index name by IndexName object
+ *
+ * @api
+ */
+interface IndexNameResolverInterface
+{
+    /**
+     * @param IndexName $indexName
+     * @return string
+     */
+    public function resolveName(IndexName $indexName): string;
+}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexStructureInterface.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexStructureInterface.php
new file mode 100644
index 00000000000..f76e6c86c77
--- /dev/null
+++ b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexStructureInterface.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\MultiDimensionalIndexer;
+
+/**
+ * Represent manipulation with index structure
+ *
+ * @api
+ */
+interface IndexStructureInterface
+{
+    /**
+     * Create the Index Structure
+     *
+     * @param IndexName $indexName
+     * @param string $connectionName
+     * @throws \Magento\Framework\Exception\StateException
+     * @return void
+     */
+    public function create(IndexName $indexName, string $connectionName);
+
+    /**
+     * Delete the given Index
+     *
+     * @param IndexName $indexName
+     * @param string $connectionName
+     * @return void
+     */
+    public function delete(IndexName $indexName, string $connectionName);
+
+    /**
+     * Checks whether the Index exits
+     *
+     * @param IndexName $indexName
+     * @param string $connectionName
+     * @return bool
+     */
+    public function isExist(IndexName $indexName, string $connectionName): bool;
+}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexTableSwitcher.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexTableSwitcher.php
new file mode 100644
index 00000000000..ed67adce690
--- /dev/null
+++ b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexTableSwitcher.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\MultiDimensionalIndexer;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+
+/**
+ * @inheritdoc
+ */
+class IndexTableSwitcher implements IndexTableSwitcherInterface
+{
+    /**
+     * Suffix for replica index table
+     *
+     * @var string
+     */
+    private $replicaTableSuffix = '_replica';
+
+    /**
+     * Suffix for outdated index table
+     *
+     * @var string
+     */
+    private $outdatedTableSuffix = '_outdated';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var IndexNameResolverInterface
+     */
+    private $indexNameResolver;
+
+    /**
+     * @param ResourceConnection $resourceConnection
+     * @param IndexNameResolverInterface $indexNameResolver
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        IndexNameResolverInterface $indexNameResolver
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->indexNameResolver = $indexNameResolver;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function switch(IndexName $indexName, string $connectionName)
+    {
+        $connection = $this->resourceConnection->getConnection($connectionName);
+        $tableName = $this->indexNameResolver->resolveName($indexName);
+
+        $this->switchTable($connection, [$tableName]);
+    }
+
+    /**
+     * Switch index tables from replica to active
+     *
+     * @param AdapterInterface $connection
+     * @param array $tableNames
+     * @return void
+     */
+    private function switchTable(AdapterInterface $connection, array $tableNames)
+    {
+        $toRename = [];
+        foreach ($tableNames as $tableName) {
+            $outdatedTableName = $tableName . $this->outdatedTableSuffix;
+            $replicaTableName = $tableName . $this->replicaTableSuffix;
+
+            $renameBatch = [
+                [
+                    'oldName' => $tableName,
+                    'newName' => $outdatedTableName,
+                ],
+                [
+                    'oldName' => $replicaTableName,
+                    'newName' => $tableName,
+                ],
+                [
+                    'oldName' => $outdatedTableName,
+                    'newName' => $replicaTableName,
+                ]
+            ];
+            $toRename = array_merge($toRename, $renameBatch);
+        }
+
+        if (!empty($toRename)) {
+            $connection->renameTablesBatch($toRename);
+        }
+    }
+}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexTableSwitcherInterface.php b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexTableSwitcherInterface.php
new file mode 100644
index 00000000000..6f067dbf6a4
--- /dev/null
+++ b/lib/internal/Magento/Framework/MultiDimensionalIndexer/IndexTableSwitcherInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\MultiDimensionalIndexer;
+
+/**
+ * Logic for switching active and replica index tables by IndexName object
+ *
+ * @api
+ */
+interface IndexTableSwitcherInterface
+{
+    /**
+     * @param IndexName $indexName
+     * @param string $connectionName
+     * @return void
+     */
+    public function switch(IndexName $indexName, string $connectionName);
+}
diff --git a/lib/internal/Magento/Framework/MultiDimensionalIndexer/README.md b/lib/internal/Magento/Framework/MultiDimensionalIndexer/README.md
new file mode 100644
index 00000000000..fcaaba0ce6d
--- /dev/null
+++ b/lib/internal/Magento/Framework/MultiDimensionalIndexer/README.md
@@ -0,0 +1,11 @@
+MultiDimensionalIndexer
+=======
+The **\Magento\Framework\MultiDimensionalIndexer** library provides functionality of multi-dimension index creation and
+handling.
+
+Library introduces a set of extension points which split monolithic index by specified Dimension (Scope), creating 
+independent index (i.e. dedicated MySQL table) per each Dimension. Along with that library provides index name 
+resolving mechanism based on provided scope. The Multi-Dimension indexes introduced for the sake of data scalability
+and ability to reindex data in the scope of particular Dimension only.
+
+Aliasing mechanism guarantees zero downtime to make Front-End responsive while Full Reindex being processed.
diff --git a/lib/internal/Magento/Framework/Registry.php b/lib/internal/Magento/Framework/Registry.php
index 825d550fc15..d1bc227437d 100644
--- a/lib/internal/Magento/Framework/Registry.php
+++ b/lib/internal/Magento/Framework/Registry.php
@@ -8,7 +8,11 @@
 /**
  * Registry model. Used to manage values in registry
  *
+ * Registry usage as a shared service introduces temporal, hard to detect coupling into system.
+ * It's usage should be avoid. Use service classes or data providers instead.
+ *
  * @api
+ * @deprecated
  */
 class Registry
 {
@@ -24,6 +28,8 @@ class Registry
      *
      * @param string $key
      * @return mixed
+     *
+     * @deprecated
      */
     public function registry($key)
     {
@@ -41,6 +47,8 @@ public function registry($key)
      * @param bool $graceful
      * @return void
      * @throws \RuntimeException
+     *
+     * @deprecated
      */
     public function register($key, $value, $graceful = false)
     {
@@ -58,6 +66,8 @@ public function register($key, $value, $graceful = false)
      *
      * @param string $key
      * @return void
+     *
+     * @deprecated
      */
     public function unregister($key)
     {
diff --git a/lib/internal/Magento/Framework/Session/Config.php b/lib/internal/Magento/Framework/Session/Config.php
index 053bd3e7fd6..296b7944ea4 100644
--- a/lib/internal/Magento/Framework/Session/Config.php
+++ b/lib/internal/Magento/Framework/Session/Config.php
@@ -11,7 +11,6 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Session\Config\ConfigInterface;
-use Magento\Framework\Session\SaveHandlerInterface;
 
 /**
  * Magento session configuration
diff --git a/lib/internal/Magento/Framework/Session/SaveHandler.php b/lib/internal/Magento/Framework/Session/SaveHandler.php
index 4ab3d8e28f1..7959130d1e4 100644
--- a/lib/internal/Magento/Framework/Session/SaveHandler.php
+++ b/lib/internal/Magento/Framework/Session/SaveHandler.php
@@ -5,10 +5,8 @@
  */
 namespace Magento\Framework\Session;
 
-use Magento\Framework\App\DeploymentConfig;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Exception\SessionException;
 use Magento\Framework\Session\Config\ConfigInterface;
+use \Magento\Framework\Exception\SessionException;
 
 /**
  * Magento session save handler
@@ -22,23 +20,16 @@ class SaveHandler implements SaveHandlerInterface
      */
     protected $saveHandlerAdapter;
 
-    /**
-     * Config
-     *
-     * @var ConfigInterface
-     */
-    private $config;
-
     /**
      * Constructor
      *
      * @param SaveHandlerFactory $saveHandlerFactory
-     * @param DeploymentConfig $deploymentConfig
+     * @param ConfigInterface $sessionConfig
      * @param string $default
      */
     public function __construct(
         SaveHandlerFactory $saveHandlerFactory,
-        DeploymentConfig $deploymentConfig,
+        ConfigInterface $sessionConfig,
         $default = self::DEFAULT_HANDLER
     ) {
         /**
@@ -47,17 +38,13 @@ public function __construct(
          * Save handler may be set to custom value in deployment config, which will override everything else.
          * Otherwise, try to read PHP settings for session.save_handler value. Otherwise, use 'files' as default.
          */
-        $defaultSaveHandler = ini_get('session.save_handler') ?: SaveHandlerInterface::DEFAULT_HANDLER;
-        $saveMethod = $deploymentConfig->get(Config::PARAM_SESSION_SAVE_METHOD, $defaultSaveHandler);
-        $this->setSaveHandler($saveMethod);
+        $saveMethod = $sessionConfig->getOption('session.save_handler') ?: $default;
 
         try {
-            $connection = $saveHandlerFactory->create($saveMethod);
+            $this->saveHandlerAdapter = $saveHandlerFactory->create($saveMethod);
         } catch (SessionException $e) {
-            $connection = $saveHandlerFactory->create($default);
-            $this->setSaveHandler($default);
+            $this->saveHandlerAdapter = $saveHandlerFactory->create($default);
         }
-        $this->saveHandlerAdapter = $connection;
     }
 
     /**
@@ -128,33 +115,4 @@ public function gc($maxLifetime)
     {
         return $this->saveHandlerAdapter->gc($maxLifetime);
     }
-
-    /**
-     * Get config
-     *
-     * @return ConfigInterface
-     * @deprecated 100.0.8
-     */
-    private function getConfig()
-    {
-        if ($this->config === null) {
-            $this->config = ObjectManager::getInstance()->get(ConfigInterface::class);
-        }
-        return $this->config;
-    }
-
-    /**
-     * Set session.save_handler option
-     *
-     * @param string $saveHandler
-     * @return $this
-     */
-    private function setSaveHandler($saveHandler)
-    {
-        if ($saveHandler === 'db' || $saveHandler === 'redis') {
-            $saveHandler = 'user';
-        }
-        $this->getConfig()->setOption('session.save_handler', $saveHandler);
-        return $this;
-    }
 }
diff --git a/lib/internal/Magento/Framework/Session/SessionManager.php b/lib/internal/Magento/Framework/Session/SessionManager.php
index 3878c1a64c9..e4130147a5d 100644
--- a/lib/internal/Magento/Framework/Session/SessionManager.php
+++ b/lib/internal/Magento/Framework/Session/SessionManager.php
@@ -314,11 +314,8 @@ public function setName($name)
      */
     public function destroy(array $options = null)
     {
-        if (null === $options) {
-            $options = $this->defaultDestroyOptions;
-        } else {
-            $options = array_merge($this->defaultDestroyOptions, $options);
-        }
+        $options = $options ?? [];
+        $options = array_merge($this->defaultDestroyOptions, $options);
 
         if ($options['clear_storage']) {
             $this->clearStorage();
@@ -501,11 +498,7 @@ public function regenerateId()
             return $this;
         }
 
-        if ($this->isSessionExists()) {
-            session_regenerate_id(true);
-        } else {
-            session_start();
-        }
+        $this->isSessionExists() ? session_regenerate_id(true) : session_start();
         $this->storage->init(isset($_SESSION) ? $_SESSION : []);
 
         if ($this->sessionConfig->getUseCookies()) {
@@ -572,12 +565,16 @@ private function initIniOptions()
         }
 
         foreach ($this->sessionConfig->getOptions() as $option => $value) {
-            $result = ini_set($option, $value);
-            if ($result === false) {
-                $error = error_get_last();
-                throw new \InvalidArgumentException(
-                    sprintf('Failed to set ini option "%s" to value "%s". %s', $option, $value, $error['message'])
-                );
+            if ($option=='session.save_handler') {
+                continue;
+            } else {
+                $result = ini_set($option, $value);
+                if ($result === false) {
+                    $error = error_get_last();
+                    throw new \InvalidArgumentException(
+                        sprintf('Failed to set ini option "%s" to value "%s". %s', $option, $value, $error['message'])
+                    );
+                }
             }
         }
     }
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php b/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
index de5503c1446..dff31a897e1 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
@@ -204,14 +204,14 @@ private function checkAbilityToSendCookie($name, $value)
 
         $sizeOfCookie = $this->sizeOfCookie($name, $value);
 
-        if ($numCookies > PhpCookieManager::MAX_NUM_COOKIES) {
+        if ($numCookies > static::MAX_NUM_COOKIES) {
             $this->logger->warning(
                 new Phrase('Unable to send the cookie. Maximum number of cookies would be exceeded.'),
                 array_merge($_COOKIE, ['user-agent' => $this->httpHeader->getHttpUserAgent()])
             );
         }
 
-        if ($sizeOfCookie > PhpCookieManager::MAX_COOKIE_SIZE) {
+        if ($sizeOfCookie > static::MAX_COOKIE_SIZE) {
             throw new CookieSizeLimitReachedException(
                 new Phrase(
                     'Unable to send the cookie. Size of \'%name\' is %size bytes.',
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
index 75b8eb2cec8..1ea942f5e90 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
@@ -47,8 +47,6 @@ class PhpCookieManagerTest extends \PHPUnit\Framework\TestCase
         const COOKIE_HTTP_ONLY = true;
         const COOKIE_NOT_HTTP_ONLY = false;
         const COOKIE_EXPIRE_END_OF_SESSION = 0;
-        const MAX_NUM_COOKIES = 50;
-        const MAX_COOKIE_SIZE = 4096;
 
         /**
          * Mapping from constant names to functions that handle the assertions.
@@ -499,7 +497,9 @@ public function testSetCookieSizeTooLarge()
                 );
 
             $cookieValue = '';
-            for ($i = 0; $i < self::MAX_COOKIE_SIZE + 1; $i++) {
+
+            $cookieManager = $this->cookieManager;
+            for ($i = 0; $i < $cookieManager::MAX_COOKIE_SIZE + 1; $i++) {
                 $cookieValue = $cookieValue . 'a';
             }
 
@@ -527,8 +527,9 @@ public function testSetTooManyCookies()
 
             $userAgent = 'some_user_agent';
 
-            // Set self::MAX_NUM_COOKIES number of cookies in superglobal $_COOKIE.
-            for ($i = count($_COOKIE); $i < self::MAX_NUM_COOKIES; $i++) {
+            $cookieManager = $this->cookieManager;
+            // Set $cookieManager::MAX_NUM_COOKIES number of cookies in superglobal $_COOKIE.
+            for ($i = count($_COOKIE); $i < $cookieManager::MAX_NUM_COOKIES; $i++) {
                 $_COOKIE['test_cookie_' . $i] = self::COOKIE_VALUE . '_' . $i;
             }
 
diff --git a/lib/internal/Magento/Framework/Test/Unit/MultiDimensionalIndexer/IndexTableSwitcherTest.php b/lib/internal/Magento/Framework/Test/Unit/MultiDimensionalIndexer/IndexTableSwitcherTest.php
new file mode 100644
index 00000000000..3a4e59275d1
--- /dev/null
+++ b/lib/internal/Magento/Framework/Test/Unit/MultiDimensionalIndexer/IndexTableSwitcherTest.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Test\Unit\MultiDimensionalIndexer;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\MultiDimensionalIndexer\IndexName;
+use Magento\Framework\MultiDimensionalIndexer\IndexNameResolverInterface;
+use Magento\Framework\MultiDimensionalIndexer\IndexTableSwitcher;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for @see IndexTableSwitcher.
+ */
+class IndexTableSwitcherTest extends TestCase
+{
+    /**
+     * @var IndexTableSwitcher|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $indexTableSwitcher;
+
+    /**
+     * @var IndexName|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $indexName;
+
+    /**
+     * @var ResourceConnection|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $resourceConnection;
+
+    /**
+     * @var IndexNameResolverInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $indexNameResolver;
+
+    /**
+     * @var AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $adapter;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $objectManager = new ObjectManager($this);
+        $this->indexName = $this->createMock(IndexName::class);
+        $this->resourceConnection = $this->createMock(ResourceConnection::class);
+        $this->indexNameResolver = $this->createMock(IndexNameResolverInterface::class);
+        $this->adapter = $this->createMock(AdapterInterface::class);
+
+        $this->indexTableSwitcher = $objectManager->getObject(
+            IndexTableSwitcher::class,
+            [
+                'resourceConnection' => $this->resourceConnection,
+                'indexNameResolver' => $this->indexNameResolver,
+            ]
+        );
+    }
+
+    public function testSwitch()
+    {
+        $connectionName = 'testConnection';
+        $tableName = 'some_table_name';
+        $toRename =
+            [
+                [
+                    'oldName' => $tableName,
+                    'newName' => $tableName . '_outdated',
+                ],
+                [
+                    'oldName' => $tableName . '_replica',
+                    'newName' => $tableName,
+                ],
+                [
+                    'oldName' => $tableName . '_outdated',
+                    'newName' => $tableName . '_replica',
+                ],
+            ];
+
+        $this->resourceConnection->expects($this->once())->method('getConnection')
+            ->with($connectionName)->willReturn($this->adapter);
+        $this->indexNameResolver->expects($this->once())->method('resolveName')
+            ->with($this->indexName)->willReturn($tableName);
+        $this->adapter->expects($this->once())->method('renameTablesBatch')
+            ->with($toRename);
+
+        $this->indexTableSwitcher->switch($this->indexName, $connectionName);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Test/Unit/TranslateTest.php b/lib/internal/Magento/Framework/Test/Unit/TranslateTest.php
index 5c689adc674..cbf3f89717b 100644
--- a/lib/internal/Magento/Framework/Test/Unit/TranslateTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/TranslateTest.php
@@ -121,34 +121,72 @@ protected function setUp()
      * @param string $area
      * @param bool $forceReload
      * @param array $cachedData
+     * @return void
+     * @dataProvider dataProviderLoadDataCachedTranslation
+     */
+    public function testLoadDataCachedTranslation($area, $forceReload, array $cachedData)
+    {
+        $this->expectsSetConfig('Magento/luma');
+
+        $this->cache->expects($this->once())
+            ->method('load')
+            ->willReturn(json_encode($cachedData));
+
+        $this->appState->expects($this->exactly($area ? 0 : 1))
+            ->method('getAreaCode')
+            ->willReturn('frontend');
+
+        $this->translate->loadData($area, $forceReload);
+        $this->assertEquals($cachedData, $this->translate->getData());
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderLoadDataCachedTranslation()
+    {
+        $cachedData = ['cached 1' => 'translated 1', 'cached 2' => 'translated 2'];
+        return [
+            ['adminhtml', false, $cachedData],
+            ['frontend', false, $cachedData],
+            [null, false, $cachedData],
+        ];
+    }
+
+    /**
+     * @param string $area
+     * @param bool $forceReload
+     * @return void
      * @dataProvider dataProviderForTestLoadData
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function testLoadData($area, $forceReload, $cachedData)
+    public function testLoadData($area, $forceReload)
     {
-        $this->expectsSetConfig('themeId');
+        $this->expectsSetConfig('Magento/luma');
+
+        $this->appState->expects($this->exactly($area ? 0 : 1))
+            ->method('getAreaCode')
+            ->willReturn('frontend');
 
         $this->cache->expects($this->exactly($forceReload ? 0 : 1))
             ->method('load')
-            ->will($this->returnValue(json_encode($cachedData)));
+            ->willReturn(false);
 
-        if (!$forceReload && $cachedData !== false) {
-            $this->translate->loadData($area, $forceReload);
-            $this->assertEquals($cachedData, $this->translate->getData());
-            return;
-        }
-
-        $this->directory->expects($this->any())->method('isExist')->will($this->returnValue(true));
+        $this->directory->expects($this->any())->method('isExist')->willReturn(true);
 
         // _loadModuleTranslation()
-        $this->moduleList->expects($this->once())->method('getNames')->will($this->returnValue(['name']));
+        $modules = ['some_module', 'other_module', 'another_module', 'current_module'];
+        $this->request->expects($this->any())
+            ->method('getControllerModule')
+            ->willReturn('current_module');
+        $this->moduleList->expects($this->once())->method('getNames')->willReturn($modules);
         $moduleData = [
             'module original' => 'module translated',
             'module theme' => 'module-theme original translated',
             'module pack' => 'module-pack original translated',
             'module db' => 'module-db original translated',
         ];
-        $this->modulesReader->expects($this->any())->method('getModuleDir')->will($this->returnValue('/app/module'));
+        $this->modulesReader->expects($this->any())->method('getModuleDir')->willReturn('/app/module');
         $themeData = [
             'theme original' => 'theme translated',
             'module theme' => 'theme translated overwrite',
@@ -157,39 +195,35 @@ public function testLoadData($area, $forceReload, $cachedData)
         ];
         $this->csvParser->expects($this->any())
             ->method('getDataPairs')
-            ->will(
-                $this->returnValueMap(
-                    [
-                        ['/app/module/en_US.csv', 0, 1, $moduleData],
-                        ['/app/module/en_GB.csv', 0, 1, $moduleData],
-                        ['/theme.csv', 0, 1, $themeData],
-                    ]
-                )
+            ->willReturnMap(
+                [
+                    ['/app/module/en_US.csv', 0, 1, $moduleData],
+                    ['/app/module/en_GB.csv', 0, 1, $moduleData],
+                    ['/theme.csv', 0, 1, $themeData],
+                ]
             );
 
-        // _loadThemeTranslation()
-        $this->viewFileSystem->expects($this->any())
-            ->method('getLocaleFileName')
-            ->will($this->returnValue('/theme.csv'));
-
         // _loadPackTranslation
         $packData = [
             'pack original' => 'pack translated',
             'module pack' => 'pack translated overwrite',
             'module db' => 'pack-db translated overwrite',
         ];
-        $this->packDictionary->expects($this->once())->method('getDictionary')->will($this->returnValue($packData));
+        $this->packDictionary->expects($this->once())->method('getDictionary')->willReturn($packData);
+
+        // _loadThemeTranslation()
+        $this->viewFileSystem->expects($this->any())
+            ->method('getLocaleFileName')
+            ->will($this->returnValue('/theme.csv'));
 
         // _loadDbTranslation()
         $dbData = [
             'db original' => 'db translated',
             'module db' => 'db translated overwrite',
         ];
-        $this->resource->expects($this->any())->method('getTranslationArray')->will($this->returnValue($dbData));
+        $this->resource->expects($this->any())->method('getTranslationArray')->willReturn($dbData);
 
-        if (!$forceReload) {
-            $this->cache->expects($this->exactly(1))->method('save');
-        }
+        $this->cache->expects($this->exactly($forceReload ? 0 : 1))->method('save');
 
         $this->translate->loadData($area, $forceReload);
 
@@ -205,28 +239,25 @@ public function testLoadData($area, $forceReload, $cachedData)
         $this->assertEquals($expected, $this->translate->getData());
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderForTestLoadData()
     {
-        $cachedData = ['cached 1' => 'translated 1', 'cached 2' => 'translated 2'];
         return [
-            ['adminhtml', true, false],
-            ['adminhtml', true, $cachedData],
-            ['adminhtml', false, $cachedData],
-            ['adminhtml', false, false],
-            ['frontend', true, false],
-            ['frontend', true, $cachedData],
-            ['frontend', false, $cachedData],
-            ['frontend', false, false],
-            [null, true, false],
-            [null, true, $cachedData],
-            [null, false, $cachedData],
-            [null, false, false]
+            ['adminhtml', true],
+            ['adminhtml', false],
+            ['frontend', true],
+            ['frontend', false],
+            [null, true],
+            [null, false],
         ];
     }
 
     /**
      * @param $data
      * @param $result
+     * @return void
      * @dataProvider dataProviderForTestGetData
      */
     public function testGetData($data, $result)
@@ -239,12 +270,15 @@ public function testGetData($data, $result)
         $this->assertEquals($result, $this->translate->getData());
     }
 
+    /**
+     * @return array
+     */
     public function dataProviderForTestGetData()
     {
         $data = ['original 1' => 'translated 1', 'original 2' => 'translated 2'];
         return [
             [$data, $data],
-            [null, []]
+            [null, []],
         ];
     }
 
@@ -309,7 +343,14 @@ protected function expectsSetConfig($themeId, $localeCode = 'en_US')
                     ]
                 )
             );
-        $designTheme = new \Magento\Framework\DataObject(['id' => $themeId]);
+        $designTheme = $this->getMockBuilder(\Magento\Theme\Model\Theme::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $designTheme->expects($this->once())
+            ->method('getThemePath')
+            ->willReturn($themeId);
+
         $this->viewDesign->expects($this->any())->method('getDesignTheme')->will($this->returnValue($designTheme));
     }
 }
diff --git a/lib/internal/Magento/Framework/Translate.php b/lib/internal/Magento/Framework/Translate.php
index 9ce3925925e..f43e52834a2 100644
--- a/lib/internal/Magento/Framework/Translate.php
+++ b/lib/internal/Magento/Framework/Translate.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
@@ -15,6 +16,12 @@
  */
 class Translate implements \Magento\Framework\TranslateInterface
 {
+    const CONFIG_AREA_KEY = 'area';
+    const CONFIG_LOCALE_KEY = 'locale';
+    const CONFIG_SCOPE_KEY = 'scope';
+    const CONFIG_THEME_KEY = 'theme';
+    const CONFIG_MODULE_KEY = 'module';
+
     /**
      * Locale code
      *
@@ -158,6 +165,14 @@ public function __construct(
         $this->directory = $filesystem->getDirectoryRead(DirectoryList::ROOT);
         $this->_csvParser = $csvParser;
         $this->packDictionary = $packDictionary;
+
+        $this->_config = [
+            self::CONFIG_AREA_KEY => null,
+            self::CONFIG_LOCALE_KEY => null,
+            self::CONFIG_SCOPE_KEY => null,
+            self::CONFIG_THEME_KEY => null,
+            self::CONFIG_MODULE_KEY => null,
+        ];
     }
 
     /**
@@ -169,17 +184,23 @@ public function __construct(
      */
     public function loadData($area = null, $forceReload = false)
     {
+        $this->_data = [];
+        if ($area === null) {
+            $area = $this->_appState->getAreaCode();
+        }
         $this->setConfig(
-            ['area' => isset($area) ? $area : $this->_appState->getAreaCode()]
+            [
+                self::CONFIG_AREA_KEY => $area,
+            ]
         );
 
         if (!$forceReload) {
-            $this->_data = $this->_loadCache();
-            if ($this->_data !== false) {
+            $data = $this->_loadCache();
+            if (false !== $data) {
+                $this->_data = $data;
                 return $this;
             }
         }
-        $this->_data = [];
 
         $this->_loadModuleTranslation();
         $this->_loadPackTranslation();
@@ -202,17 +223,17 @@ public function loadData($area = null, $forceReload = false)
     protected function setConfig($config)
     {
         $this->_config = $config;
-        if (!isset($this->_config['locale'])) {
-            $this->_config['locale'] = $this->getLocale();
+        if (!isset($this->_config[self::CONFIG_LOCALE_KEY])) {
+            $this->_config[self::CONFIG_LOCALE_KEY] = $this->getLocale();
         }
-        if (!isset($this->_config['scope'])) {
-            $this->_config['scope'] = $this->getScope();
+        if (!isset($this->_config[self::CONFIG_SCOPE_KEY])) {
+            $this->_config[self::CONFIG_SCOPE_KEY] = $this->getScope();
         }
-        if (!isset($this->_config['theme'])) {
-            $this->_config['theme'] = $this->_viewDesign->getDesignTheme()->getId();
+        if (!isset($this->_config[self::CONFIG_THEME_KEY])) {
+            $this->_config[self::CONFIG_THEME_KEY] = $this->_viewDesign->getDesignTheme()->getThemePath();
         }
-        if (!isset($this->_config['module'])) {
-            $this->_config['module'] = $this->getControllerModuleName();
+        if (!isset($this->_config[self::CONFIG_MODULE_KEY])) {
+            $this->_config[self::CONFIG_MODULE_KEY] = $this->getControllerModuleName();
         }
         return $this;
     }
@@ -224,7 +245,7 @@ protected function setConfig($config)
      */
     protected function getScope()
     {
-        $scope = ($this->getConfig('area') == 'adminhtml') ? 'admin' : null;
+        $scope = ($this->getConfig(self::CONFIG_AREA_KEY) === 'adminhtml') ? 'admin' : null;
         return $this->_scopeResolver->getScope($scope)->getCode();
     }
 
@@ -295,7 +316,7 @@ protected function _addData($data)
             }
 
             $key = str_replace('""', '"', $key);
-            $value  = str_replace('""', '"', $value);
+            $value = str_replace('""', '"', $value);
 
             $this->_data[$key] = $value;
         }
@@ -309,10 +330,6 @@ protected function _addData($data)
      */
     protected function _loadThemeTranslation()
     {
-        if (!$this->_config['theme']) {
-            return $this;
-        }
-
         $file = $this->_getThemeTranslationFile($this->getLocale());
         if ($file) {
             $this->_addData($this->_getFileData($file));
@@ -339,7 +356,7 @@ protected function _loadPackTranslation()
     protected function _loadDbTranslation()
     {
         $data = $this->_translateResource->getTranslationArray(null, $this->getLocale());
-        $this->_addData(array_map("htmlspecialchars_decode", $data));
+        $this->_addData(array_map('htmlspecialchars_decode', $data));
         return $this;
     }
 
@@ -367,7 +384,7 @@ protected function _getThemeTranslationFile($locale)
     {
         return $this->_viewFileSystem->getLocaleFileName(
             'i18n' . '/' . $locale . '.csv',
-            ['area' => $this->getConfig('area')]
+            $this->_config
         );
     }
 
@@ -422,8 +439,7 @@ public function getLocale()
     public function setLocale($locale)
     {
         $this->_localeCode = $locale;
-        $this->_config['locale'] = $locale;
-        $this->getCacheId(true);
+        $this->_config[self::CONFIG_LOCALE_KEY] = $locale;
         return $this;
     }
 
@@ -434,40 +450,29 @@ public function setLocale($locale)
      */
     public function getTheme()
     {
-        $theme = $this->request->getParam('theme');
+        $theme = $this->request->getParam(self::CONFIG_THEME_KEY);
         if (empty($theme)) {
-            return 'theme' . $this->getConfig('theme');
+            return self::CONFIG_THEME_KEY . $this->getConfig(self::CONFIG_THEME_KEY);
         }
-        return 'theme' . $theme['theme_title'];
+        return self::CONFIG_THEME_KEY . $theme['theme_title'];
     }
 
     /**
      * Retrieve cache identifier
      *
-     * @param bool $forceReload
      * @return string
      */
-    protected function getCacheId($forceReload = false)
+    protected function getCacheId()
     {
-        if ($this->_cacheId === null || $forceReload) {
-            $this->_cacheId = \Magento\Framework\App\Cache\Type\Translate::TYPE_IDENTIFIER;
-            if (isset($this->_config['locale'])) {
-                $this->_cacheId .= '_' . $this->_config['locale'];
-            }
-            if (isset($this->_config['area'])) {
-                $this->_cacheId .= '_' . $this->_config['area'];
-            }
-            if (isset($this->_config['scope'])) {
-                $this->_cacheId .= '_' . $this->_config['scope'];
-            }
-            if (isset($this->_config['theme'])) {
-                $this->_cacheId .= '_' . $this->_config['theme'];
-            }
-            if (isset($this->_config['module'])) {
-                $this->_cacheId .= '_' . $this->_config['module'];
-            }
-        }
-        return $this->_cacheId;
+        $_cacheId = \Magento\Framework\App\Cache\Type\Translate::TYPE_IDENTIFIER;
+        $_cacheId .= '_' . $this->_config[self::CONFIG_LOCALE_KEY];
+        $_cacheId .= '_' . $this->_config[self::CONFIG_AREA_KEY];
+        $_cacheId .= '_' . $this->_config[self::CONFIG_SCOPE_KEY];
+        $_cacheId .= '_' . $this->_config[self::CONFIG_THEME_KEY];
+        $_cacheId .= '_' . $this->_config[self::CONFIG_MODULE_KEY];
+
+        $this->_cacheId = $_cacheId;
+        return $_cacheId;
     }
 
     /**
@@ -491,7 +496,7 @@ protected function _loadCache()
      */
     protected function _saveCache()
     {
-        $this->_cache->save($this->getSerializer()->serialize($this->getData()), $this->getCacheId(true), [], false);
+        $this->_cache->save($this->getSerializer()->serialize($this->getData()), $this->getCacheId(), [], false);
         return $this;
     }
 
diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json
index 23032f7e6d2..c725413bf05 100644
--- a/lib/internal/Magento/Framework/composer.json
+++ b/lib/internal/Magento/Framework/composer.json
@@ -23,7 +23,7 @@
         "ext-xsl": "*",
         "lib-libxml": "*",
         "colinmollenhour/php-redis-session-abstract": "~1.3.8",
-        "composer/composer": "~1.6.0",
+        "composer/composer": "^1.6",
         "magento/zendframework1": "~1.13.0",
         "monolog/monolog": "^1.17",
         "oyejorge/less.php": "~1.7.0",
diff --git a/lib/web/css/source/lib/_navigation.less b/lib/web/css/source/lib/_navigation.less
index 93101fd7c19..6ed3a9671ab 100644
--- a/lib/web/css/source/lib/_navigation.less
+++ b/lib/web/css/source/lib/_navigation.less
@@ -324,6 +324,7 @@
                 .lib-css(text-decoration, @_nav-level0-item-text-decoration);
                 box-sizing: border-box;
                 position: relative;
+                display: inline-block;
 
                 &:hover, &.ui-state-focus {
                     .lib-css(background, @_nav-level0-item-background-color-hover);
diff --git a/lib/web/css/source/lib/variables/_typography.less b/lib/web/css/source/lib/variables/_typography.less
index aae79974785..bf88990fe05 100644
--- a/lib/web/css/source/lib/variables/_typography.less
+++ b/lib/web/css/source/lib/variables/_typography.less
@@ -12,7 +12,6 @@
 //  ---------------------------------------------
 
 //  Path
-@font-path: "../../fonts/";
 @icons__font-path: "@{baseDir}fonts/Blank-Theme-Icons/Blank-Theme-Icons";
 
 //  Names
diff --git a/lib/web/jquery/jquery-migrate.js b/lib/web/jquery/jquery-migrate.js
index 25b6c813146..d5ce9187d5b 100644
--- a/lib/web/jquery/jquery-migrate.js
+++ b/lib/web/jquery/jquery-migrate.js
@@ -1,13 +1,15 @@
 /*!
- * jQuery Migrate - v1.2.1 - 2013-05-08
- * https://github.com/jquery/jquery-migrate
- * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; Licensed MIT
+ * jQuery Migrate - v1.4.1 - 2016-05-19
+ * Copyright jQuery Foundation and other contributors
  */
 (function( jQuery, window, undefined ) {
 // See http://bugs.jquery.com/ticket/13335
 // "use strict";
 
 
+jQuery.migrateVersion = "1.4.1";
+
+
 var warnedAbout = {};
 
 // List of warnings already given; public read only
@@ -17,8 +19,10 @@ jQuery.migrateWarnings = [];
 // jQuery.migrateMute = false;
 
 // Show a message on the console so devs know we're active
-if ( !jQuery.migrateMute && window.console && window.console.log ) {
-	window.console.log("JQMIGRATE: Logging is active");
+if ( window.console && window.console.log ) {
+	window.console.log( "JQMIGRATE: Migrate is installed" +
+		( jQuery.migrateMute ? "" : " with logging active" ) +
+		", version " + jQuery.migrateVersion );
 }
 
 // Set to false to disable traces that appear with warnings
@@ -152,7 +156,7 @@ jQuery.attr = function( elem, name, value, pass ) {
 
 		// Warn only for attributes that can remain distinct from their properties post-1.9
 		if ( ruseDefault.test( lowerName ) ) {
-			migrateWarn( "jQuery.fn.attr('" + lowerName + "') may use property instead of attribute" );
+			migrateWarn( "jQuery.fn.attr('" + lowerName + "') might use property instead of attribute" );
 		}
 	}
 
@@ -189,46 +193,114 @@ jQuery.attrHooks.value = {
 
 var matched, browser,
 	oldInit = jQuery.fn.init,
+	oldFind = jQuery.find,
 	oldParseJSON = jQuery.parseJSON,
+	rspaceAngle = /^\s*</,
+	rattrHashTest = /\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/,
+	rattrHashGlob = /\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/g,
 	// Note: XSS check is done below after string is trimmed
 	rquickExpr = /^([^<]*)(<[\w\W]+>)([^>]*)$/;
 
 // $(html) "looks like html" rule change
 jQuery.fn.init = function( selector, context, rootjQuery ) {
-	var match;
+	var match, ret;
 
-	if ( selector && typeof selector === "string" && !jQuery.isPlainObject( context ) &&
-			(match = rquickExpr.exec( jQuery.trim( selector ) )) && match[ 0 ] ) {
-		// This is an HTML string according to the "old" rules; is it still?
-		if ( selector.charAt( 0 ) !== "<" ) {
-			migrateWarn("$(html) HTML strings must start with '<' character");
-		}
-		if ( match[ 3 ] ) {
-			migrateWarn("$(html) HTML text after last tag is ignored");
-		}
-		// Consistently reject any HTML-like string starting with a hash (#9521)
-		// Note that this may break jQuery 1.6.x code that otherwise would work.
-		if ( match[ 0 ].charAt( 0 ) === "#" ) {
-			migrateWarn("HTML string cannot start with a '#' character");
-			jQuery.error("JQMIGRATE: Invalid selector string (XSS)");
-		}
-		// Now process using loose rules; let pre-1.8 play too
-		if ( context && context.context ) {
-			// jQuery object as context; parseHTML expects a DOM object
-			context = context.context;
+	if ( selector && typeof selector === "string" ) {
+		if ( !jQuery.isPlainObject( context ) &&
+				(match = rquickExpr.exec( jQuery.trim( selector ) )) && match[ 0 ] ) {
+
+			// This is an HTML string according to the "old" rules; is it still?
+			if ( !rspaceAngle.test( selector ) ) {
+				migrateWarn("$(html) HTML strings must start with '<' character");
+			}
+			if ( match[ 3 ] ) {
+				migrateWarn("$(html) HTML text after last tag is ignored");
+			}
+
+			// Consistently reject any HTML-like string starting with a hash (gh-9521)
+			// Note that this may break jQuery 1.6.x code that otherwise would work.
+			if ( match[ 0 ].charAt( 0 ) === "#" ) {
+				migrateWarn("HTML string cannot start with a '#' character");
+				jQuery.error("JQMIGRATE: Invalid selector string (XSS)");
+			}
+
+			// Now process using loose rules; let pre-1.8 play too
+			// Is this a jQuery context? parseHTML expects a DOM element (#178)
+			if ( context && context.context && context.context.nodeType ) {
+				context = context.context;
+			}
+
+			if ( jQuery.parseHTML ) {
+				return oldInit.call( this,
+						jQuery.parseHTML( match[ 2 ], context && context.ownerDocument ||
+							context || document, true ), context, rootjQuery );
+			}
 		}
-		if ( jQuery.parseHTML ) {
-			return oldInit.call( this, jQuery.parseHTML( match[ 2 ], context, true ),
-					context, rootjQuery );
+	}
+
+	ret = oldInit.apply( this, arguments );
+
+	// Fill in selector and context properties so .live() works
+	if ( selector && selector.selector !== undefined ) {
+		// A jQuery object, copy its properties
+		ret.selector = selector.selector;
+		ret.context = selector.context;
+
+	} else {
+		ret.selector = typeof selector === "string" ? selector : "";
+		if ( selector ) {
+			ret.context = selector.nodeType? selector : context || document;
 		}
 	}
-	return oldInit.apply( this, arguments );
+
+	return ret;
 };
 jQuery.fn.init.prototype = jQuery.fn;
 
+jQuery.find = function( selector ) {
+	var args = Array.prototype.slice.call( arguments );
+
+	// Support: PhantomJS 1.x
+	// String#match fails to match when used with a //g RegExp, only on some strings
+	if ( typeof selector === "string" && rattrHashTest.test( selector ) ) {
+
+		// The nonstandard and undocumented unquoted-hash was removed in jQuery 1.12.0
+		// First see if qS thinks it's a valid selector, if so avoid a false positive
+		try {
+			document.querySelector( selector );
+		} catch ( err1 ) {
+
+			// Didn't *look* valid to qSA, warn and try quoting what we think is the value
+			selector = selector.replace( rattrHashGlob, function( _, attr, op, value ) {
+				return "[" + attr + op + "\"" + value + "\"]";
+			} );
+
+			// If the regexp *may* have created an invalid selector, don't update it
+			// Note that there may be false alarms if selector uses jQuery extensions
+			try {
+				document.querySelector( selector );
+				migrateWarn( "Attribute selector with '#' must be quoted: " + args[ 0 ] );
+				args[ 0 ] = selector;
+			} catch ( err2 ) {
+				migrateWarn( "Attribute selector with '#' was not fixed: " + args[ 0 ] );
+			}
+		}
+	}
+
+	return oldFind.apply( this, args );
+};
+
+// Copy properties attached to original jQuery.find method (e.g. .attr, .isXML)
+var findProp;
+for ( findProp in oldFind ) {
+	if ( Object.prototype.hasOwnProperty.call( oldFind, findProp ) ) {
+		jQuery.find[ findProp ] = oldFind[ findProp ];
+	}
+}
+
 // Let $.parseJSON(falsy_value) return null
 jQuery.parseJSON = function( json ) {
-	if ( !json && json !== null ) {
+	if ( !json ) {
 		migrateWarn("jQuery.parseJSON requires a valid JSON string");
 		return null;
 	}
@@ -274,6 +346,11 @@ if ( !jQuery.browser ) {
 // Warn if the code tries to get jQuery.browser
 migrateWarnProp( jQuery, "browser", jQuery.browser, "jQuery.browser is deprecated" );
 
+// jQuery.boxModel deprecated in 1.3, jQuery.support.boxModel deprecated in 1.7
+jQuery.boxModel = jQuery.support.boxModel = (document.compatMode === "CSS1Compat");
+migrateWarnProp( jQuery, "boxModel", jQuery.boxModel, "jQuery.boxModel is deprecated" );
+migrateWarnProp( jQuery.support, "boxModel", jQuery.support.boxModel, "jQuery.support.boxModel is deprecated" );
+
 jQuery.sub = function() {
 	function jQuerySub( selector, context ) {
 		return new jQuerySub.fn.init( selector, context );
@@ -284,11 +361,10 @@ jQuery.sub = function() {
 	jQuerySub.fn.constructor = jQuerySub;
 	jQuerySub.sub = this.sub;
 	jQuerySub.fn.init = function init( selector, context ) {
-		if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
-			context = jQuerySub( context );
-		}
-
-		return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
+		var instance = jQuery.fn.init.call( this, selector, context, rootjQuerySub );
+		return instance instanceof jQuerySub ?
+			instance :
+			jQuerySub( instance );
 	};
 	jQuerySub.fn.init.prototype = jQuerySub.fn;
 	var rootjQuerySub = jQuerySub(document);
@@ -296,6 +372,57 @@ jQuery.sub = function() {
 	return jQuerySub;
 };
 
+// The number of elements contained in the matched element set
+jQuery.fn.size = function() {
+	migrateWarn( "jQuery.fn.size() is deprecated; use the .length property" );
+	return this.length;
+};
+
+
+var internalSwapCall = false;
+
+// If this version of jQuery has .swap(), don't false-alarm on internal uses
+if ( jQuery.swap ) {
+	jQuery.each( [ "height", "width", "reliableMarginRight" ], function( _, name ) {
+		var oldHook = jQuery.cssHooks[ name ] && jQuery.cssHooks[ name ].get;
+
+		if ( oldHook ) {
+			jQuery.cssHooks[ name ].get = function() {
+				var ret;
+
+				internalSwapCall = true;
+				ret = oldHook.apply( this, arguments );
+				internalSwapCall = false;
+				return ret;
+			};
+		}
+	});
+}
+
+jQuery.swap = function( elem, options, callback, args ) {
+	var ret, name,
+		old = {};
+
+	if ( !internalSwapCall ) {
+		migrateWarn( "jQuery.swap() is undocumented and deprecated" );
+	}
+
+	// Remember the old values, and insert the new ones
+	for ( name in options ) {
+		old[ name ] = elem.style[ name ];
+		elem.style[ name ] = options[ name ];
+	}
+
+	ret = callback.apply( elem, args || [] );
+
+	// Revert the old values
+	for ( name in options ) {
+		elem.style[ name ] = old[ name ];
+	}
+
+	return ret;
+};
+
 
 // Ensure that $.ajax gets the new parseJSON defined in core.js
 jQuery.ajaxSetup({
@@ -324,13 +451,7 @@ jQuery.fn.data = function( name ) {
 };
 
 
-var rscriptType = /\/(java|ecma)script/i,
-	oldSelf = jQuery.fn.andSelf || jQuery.fn.addBack;
-
-jQuery.fn.andSelf = function() {
-	migrateWarn("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()");
-	return oldSelf.apply( this, arguments );
-};
+var rscriptType = /\/(java|ecma)script/i;
 
 // Since jQuery.clean is used internally on older versions, we only shim if it's missing
 if ( !jQuery.clean ) {
@@ -388,6 +509,7 @@ var eventAdd = jQuery.event.add,
 	oldToggle = jQuery.fn.toggle,
 	oldLive = jQuery.fn.live,
 	oldDie = jQuery.fn.die,
+	oldLoad = jQuery.fn.load,
 	ajaxEvents = "ajaxStart|ajaxStop|ajaxSend|ajaxComplete|ajaxError|ajaxSuccess",
 	rajaxEvent = new RegExp( "\\b(?:" + ajaxEvents + ")\\b" ),
 	rhoverHack = /(?:^|\s)hover(\.\S+|)\b/,
@@ -422,17 +544,35 @@ jQuery.event.remove = function( elem, types, handler, selector, mappedTypes ){
 	eventRemove.call( this, elem, hoverHack( types ) || "", handler, selector, mappedTypes );
 };
 
-jQuery.fn.error = function() {
-	var args = Array.prototype.slice.call( arguments, 0);
-	migrateWarn("jQuery.fn.error() is deprecated");
-	args.splice( 0, 0, "error" );
-	if ( arguments.length ) {
-		return this.bind.apply( this, args );
-	}
-	// error event should not bubble to window, although it does pre-1.7
-	this.triggerHandler.apply( this, args );
-	return this;
-};
+jQuery.each( [ "load", "unload", "error" ], function( _, name ) {
+
+	jQuery.fn[ name ] = function() {
+		var args = Array.prototype.slice.call( arguments, 0 );
+
+		// If this is an ajax load() the first arg should be the string URL;
+		// technically this could also be the "Anything" arg of the event .load()
+		// which just goes to show why this dumb signature has been deprecated!
+		// jQuery custom builds that exclude the Ajax module justifiably die here.
+		if ( name === "load" && typeof args[ 0 ] === "string" ) {
+			return oldLoad.apply( this, args );
+		}
+
+		migrateWarn( "jQuery.fn." + name + "() is deprecated" );
+
+		args.splice( 0, 0, name );
+		if ( arguments.length ) {
+			return this.bind.apply( this, args );
+		}
+
+		// Use .triggerHandler here because:
+		// - load and unload events don't need to bubble, only applied to window or image
+		// - error event should not bubble to window, although it does pre-1.7
+		// See http://bugs.jquery.com/ticket/11820
+		this.triggerHandler.apply( this, args );
+		return this;
+	};
+
+});
 
 jQuery.fn.toggle = function( fn, fn2 ) {
 
@@ -501,7 +641,7 @@ jQuery.each( ajaxEvents.split("|"),
 				// The document needs no shimming; must be !== for oldIE
 				if ( elem !== document ) {
 					jQuery.event.add( document, name + "." + jQuery.guid, function() {
-						jQuery.event.trigger( name, null, elem, true );
+						jQuery.event.trigger( name, Array.prototype.slice.call( arguments, 1 ), elem, true );
 					});
 					jQuery._data( this, name, jQuery.guid++ );
 				}
@@ -517,5 +657,97 @@ jQuery.each( ajaxEvents.split("|"),
 	}
 );
 
+jQuery.event.special.ready = {
+	setup: function() {
+		if ( this === document ) {
+			migrateWarn( "'ready' event is deprecated" );
+		}
+	}
+};
+
+var oldSelf = jQuery.fn.andSelf || jQuery.fn.addBack,
+	oldFnFind = jQuery.fn.find;
+
+jQuery.fn.andSelf = function() {
+	migrateWarn("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()");
+	return oldSelf.apply( this, arguments );
+};
+
+jQuery.fn.find = function( selector ) {
+	var ret = oldFnFind.apply( this, arguments );
+	ret.context = this.context;
+	ret.selector = this.selector ? this.selector + " " + selector : selector;
+	return ret;
+};
+
+
+// jQuery 1.6 did not support Callbacks, do not warn there
+if ( jQuery.Callbacks ) {
+
+	var oldDeferred = jQuery.Deferred,
+		tuples = [
+			// action, add listener, callbacks, .then handlers, final state
+			[ "resolve", "done", jQuery.Callbacks("once memory"),
+				jQuery.Callbacks("once memory"), "resolved" ],
+			[ "reject", "fail", jQuery.Callbacks("once memory"),
+				jQuery.Callbacks("once memory"), "rejected" ],
+			[ "notify", "progress", jQuery.Callbacks("memory"),
+				jQuery.Callbacks("memory") ]
+		];
+
+	jQuery.Deferred = function( func ) {
+		var deferred = oldDeferred(),
+			promise = deferred.promise();
+
+		deferred.pipe = promise.pipe = function( /* fnDone, fnFail, fnProgress */ ) {
+			var fns = arguments;
+
+			migrateWarn( "deferred.pipe() is deprecated" );
+
+			return jQuery.Deferred(function( newDefer ) {
+				jQuery.each( tuples, function( i, tuple ) {
+					var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
+					// deferred.done(function() { bind to newDefer or newDefer.resolve })
+					// deferred.fail(function() { bind to newDefer or newDefer.reject })
+					// deferred.progress(function() { bind to newDefer or newDefer.notify })
+					deferred[ tuple[1] ](function() {
+						var returned = fn && fn.apply( this, arguments );
+						if ( returned && jQuery.isFunction( returned.promise ) ) {
+							returned.promise()
+								.done( newDefer.resolve )
+								.fail( newDefer.reject )
+								.progress( newDefer.notify );
+						} else {
+							newDefer[ tuple[ 0 ] + "With" ](
+								this === promise ? newDefer.promise() : this,
+								fn ? [ returned ] : arguments
+							);
+						}
+					});
+				});
+				fns = null;
+			}).promise();
+
+		};
+
+		deferred.isResolved = function() {
+			migrateWarn( "deferred.isResolved is deprecated" );
+			return deferred.state() === "resolved";
+		};
+
+		deferred.isRejected = function() {
+			migrateWarn( "deferred.isRejected is deprecated" );
+			return deferred.state() === "rejected";
+		};
+
+		if ( func ) {
+			func.call( deferred, deferred );
+		}
+
+		return deferred;
+	};
+
+}
 
 })( jQuery, window );
+
diff --git a/lib/web/jquery/jquery.ba-hashchange.min.js b/lib/web/jquery/jquery.ba-hashchange.min.js
deleted file mode 100644
index 3c607bae3d6..00000000000
--- a/lib/web/jquery/jquery.ba-hashchange.min.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * jQuery hashchange event - v1.3 - 7/21/2010
- * http://benalman.com/projects/jquery-hashchange-plugin/
- * 
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-(function($,e,b){var c="hashchange",h=document,f,g=$.event.special,i=h.documentMode,d="on"+c in e&&(i===b||i>7);function a(j){j=j||location.href;return"#"+j.replace(/^[^#]*#?(.*)$/,"$1")}$.fn[c]=function(j){return j?this.bind(c,j):this.trigger(c)};$.fn[c].delay=50;g[c]=$.extend(g[c],{setup:function(){if(d){return false}$(f.start)},teardown:function(){if(d){return false}$(f.stop)}});f=(function(){var j={},p,m=a(),k=function(q){return q},l=k,o=k;j.start=function(){p||n()};j.stop=function(){p&&clearTimeout(p);p=b};function n(){var r=a(),q=o(m);if(r!==m){l(m=r,q);$(e).trigger(c)}else{if(q!==m){location.href=location.href.replace(/#.*/,"")+q}}p=setTimeout(n,$.fn[c].delay)}$.browser.msie&&!d&&(function(){var q,r;j.start=function(){if(!q){r=$.fn[c].src;r=r&&r+a();q=$('<iframe tabindex="-1" title="empty"/>').hide().one("load",function(){r||l(a());n()}).attr("src",r||"javascript:0").insertAfter("body")[0].contentWindow;h.onpropertychange=function(){try{if(event.propertyName==="title"){q.document.title=h.title}}catch(s){}}}};j.stop=k;o=function(){return a(q.location.href)};l=function(v,s){var u=q.document,t=$.fn[c].domain;if(v!==s){u.title=h.title;u.open();t&&u.write('<script>document.domain="'+t+'"<\/script>');u.close();q.location.hash=v}}})();return j})()})(jQuery,this);
\ No newline at end of file
diff --git a/lib/web/legacy-build.min.js b/lib/web/legacy-build.min.js
index bc6cc996f88..52d132d634b 100644
--- a/lib/web/legacy-build.min.js
+++ b/lib/web/legacy-build.min.js
@@ -5,4 +5,4 @@ var Prototype={Version:"1.7",Browser:(function(){var d=navigator.userAgent;var b
  *  Released under the MIT, BSD, and GPL Licenses.
  *  More information: http://sizzlejs.com/
  */
-(function(){var w=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,p=0,g=Object.prototype.toString,u=false,o=true;[0,0].sort(function(){o=false;return 0});var d=function(L,B,I,D){I=I||[];var e=B=B||document;if(B.nodeType!==1&&B.nodeType!==9){return[]}if(!L||typeof L!=="string"){return I}var J=[],K,G,P,O,H,A,z=true,E=v(B),N=L;while((w.exec(""),K=w.exec(N))!==null){N=K[3];J.push(K[1]);if(K[2]){A=K[3];break}}if(J.length>1&&q.exec(L)){if(J.length===2&&h.relative[J[0]]){G=l(J[0]+J[1],B)}else{G=h.relative[J[0]]?[B]:d(J.shift(),B);while(J.length){L=J.shift();if(h.relative[L]){L+=J.shift()}G=l(L,G)}}}else{if(!D&&J.length>1&&B.nodeType===9&&!E&&h.match.ID.test(J[0])&&!h.match.ID.test(J[J.length-1])){var Q=d.find(J.shift(),B,E);B=Q.expr?d.filter(Q.expr,Q.set)[0]:Q.set[0]}if(B){var Q=D?{expr:J.pop(),set:b(D)}:d.find(J.pop(),J.length===1&&(J[0]==="~"||J[0]==="+")&&B.parentNode?B.parentNode:B,E);G=Q.expr?d.filter(Q.expr,Q.set):Q.set;if(J.length>0){P=b(G)}else{z=false}while(J.length){var C=J.pop(),F=C;if(!h.relative[C]){C=""}else{F=J.pop()}if(F==null){F=B}h.relative[C](P,F,E)}}else{P=J=[]}}if(!P){P=G}if(!P){throw"Syntax error, unrecognized expression: "+(C||L)}if(g.call(P)==="[object Array]"){if(!z){I.push.apply(I,P)}else{if(B&&B.nodeType===1){for(var M=0;P[M]!=null;M++){if(P[M]&&(P[M]===true||P[M].nodeType===1&&n(B,P[M]))){I.push(G[M])}}}else{for(var M=0;P[M]!=null;M++){if(P[M]&&P[M].nodeType===1){I.push(G[M])}}}}}else{b(P,I)}if(A){d(A,e,I,D);d.uniqueSort(I)}return I};d.uniqueSort=function(z){if(f){u=o;z.sort(f);if(u){for(var e=1;e<z.length;e++){if(z[e]===z[e-1]){z.splice(e--,1)}}}}return z};d.matches=function(e,z){return d(e,null,null,z)};d.find=function(F,e,G){var E,C;if(!F){return[]}for(var B=0,A=h.order.length;B<A;B++){var D=h.order[B],C;if((C=h.leftMatch[D].exec(F))){var z=C[1];C.splice(1,1);if(z.substr(z.length-1)!=="\\"){C[1]=(C[1]||"").replace(/\\/g,"");E=h.find[D](C,e,G);if(E!=null){F=F.replace(h.match[D],"");break}}}}if(!E){E=e.getElementsByTagName("*")}return{set:E,expr:F}};d.filter=function(I,H,L,B){var A=I,N=[],F=H,D,e,E=H&&H[0]&&v(H[0]);while(I&&H.length){for(var G in h.filter){if((D=h.match[G].exec(I))!=null){var z=h.filter[G],M,K;e=false;if(F==N){N=[]}if(h.preFilter[G]){D=h.preFilter[G](D,F,L,N,B,E);if(!D){e=M=true}else{if(D===true){continue}}}if(D){for(var C=0;(K=F[C])!=null;C++){if(K){M=z(K,D,C,F);var J=B^!!M;if(L&&M!=null){if(J){e=true}else{F[C]=false}}else{if(J){N.push(K);e=true}}}}}if(M!==undefined){if(!L){F=N}I=I.replace(h.match[G],"");if(!e){return[]}break}}}if(I==A){if(e==null){throw"Syntax error, unrecognized expression: "+I}else{break}}A=I}return F};var h=d.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(e){return e.getAttribute("href")}},relative:{"+":function(F,e,E){var C=typeof e==="string",G=C&&!/\W/.test(e),D=C&&!G;if(G&&!E){e=e.toUpperCase()}for(var B=0,A=F.length,z;B<A;B++){if((z=F[B])){while((z=z.previousSibling)&&z.nodeType!==1){}F[B]=D||z&&z.nodeName===e?z||false:z===e}}if(D){d.filter(e,F,true)}},">":function(E,z,F){var C=typeof z==="string";if(C&&!/\W/.test(z)){z=F?z:z.toUpperCase();for(var A=0,e=E.length;A<e;A++){var D=E[A];if(D){var B=D.parentNode;E[A]=B.nodeName===z?B:false}}}else{for(var A=0,e=E.length;A<e;A++){var D=E[A];if(D){E[A]=C?D.parentNode:D.parentNode===z}}if(C){d.filter(z,E,true)}}},"":function(B,z,D){var A=p++,e=y;if(!/\W/.test(z)){var C=z=D?z:z.toUpperCase();e=t}e("parentNode",z,A,B,C,D)},"~":function(B,z,D){var A=p++,e=y;if(typeof z==="string"&&!/\W/.test(z)){var C=z=D?z:z.toUpperCase();e=t}e("previousSibling",z,A,B,C,D)}},find:{ID:function(z,A,B){if(typeof A.getElementById!=="undefined"&&!B){var e=A.getElementById(z[1]);return e?[e]:[]}},NAME:function(A,D,E){if(typeof D.getElementsByName!=="undefined"){var z=[],C=D.getElementsByName(A[1]);for(var B=0,e=C.length;B<e;B++){if(C[B].getAttribute("name")===A[1]){z.push(C[B])}}return z.length===0?null:z}},TAG:function(e,z){return z.getElementsByTagName(e[1])}},preFilter:{CLASS:function(B,z,A,e,E,F){B=" "+B[1].replace(/\\/g,"")+" ";if(F){return B}for(var C=0,D;(D=z[C])!=null;C++){if(D){if(E^(D.className&&(" "+D.className+" ").indexOf(B)>=0)){if(!A){e.push(D)}}else{if(A){z[C]=false}}}}return false},ID:function(e){return e[1].replace(/\\/g,"")},TAG:function(z,e){for(var A=0;e[A]===false;A++){}return e[A]&&v(e[A])?z[1]:z[1].toUpperCase()},CHILD:function(e){if(e[1]=="nth"){var z=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(e[2]=="even"&&"2n"||e[2]=="odd"&&"2n+1"||!/\D/.test(e[2])&&"0n+"+e[2]||e[2]);e[2]=(z[1]+(z[2]||1))-0;e[3]=z[3]-0}e[0]=p++;return e},ATTR:function(C,z,A,e,D,E){var B=C[1].replace(/\\/g,"");if(!E&&h.attrMap[B]){C[1]=h.attrMap[B]}if(C[2]==="~="){C[4]=" "+C[4]+" "}return C},PSEUDO:function(C,z,A,e,D){if(C[1]==="not"){if((w.exec(C[3])||"").length>1||/^\w/.test(C[3])){C[3]=d(C[3],null,null,z)}else{var B=d.filter(C[3],z,A,true^D);if(!A){e.push.apply(e,B)}return false}}else{if(h.match.POS.test(C[0])||h.match.CHILD.test(C[0])){return true}}return C},POS:function(e){e.unshift(true);return e}},filters:{enabled:function(e){return e.disabled===false&&e.type!=="hidden"},disabled:function(e){return e.disabled===true},checked:function(e){return e.checked===true},selected:function(e){e.parentNode.selectedIndex;return e.selected===true},parent:function(e){return !!e.firstChild},empty:function(e){return !e.firstChild},has:function(A,z,e){return !!d(e[3],A).length},header:function(e){return/h\d/i.test(e.nodeName)},text:function(e){return"text"===e.type},radio:function(e){return"radio"===e.type},checkbox:function(e){return"checkbox"===e.type},file:function(e){return"file"===e.type},password:function(e){return"password"===e.type},submit:function(e){return"submit"===e.type},image:function(e){return"image"===e.type},reset:function(e){return"reset"===e.type},button:function(e){return"button"===e.type||e.nodeName.toUpperCase()==="BUTTON"},input:function(e){return/input|select|textarea|button/i.test(e.nodeName)}},setFilters:{first:function(z,e){return e===0},last:function(A,z,e,B){return z===B.length-1},even:function(z,e){return e%2===0},odd:function(z,e){return e%2===1},lt:function(A,z,e){return z<e[3]-0},gt:function(A,z,e){return z>e[3]-0},nth:function(A,z,e){return e[3]-0==z},eq:function(A,z,e){return e[3]-0==z}},filter:{PSEUDO:function(E,A,B,F){var z=A[1],C=h.filters[z];if(C){return C(E,B,A,F)}else{if(z==="contains"){return(E.textContent||E.innerText||"").indexOf(A[3])>=0}else{if(z==="not"){var D=A[3];for(var B=0,e=D.length;B<e;B++){if(D[B]===E){return false}}return true}}}},CHILD:function(e,B){var E=B[1],z=e;switch(E){case"only":case"first":while((z=z.previousSibling)){if(z.nodeType===1){return false}}if(E=="first"){return true}z=e;case"last":while((z=z.nextSibling)){if(z.nodeType===1){return false}}return true;case"nth":var A=B[2],H=B[3];if(A==1&&H==0){return true}var D=B[0],G=e.parentNode;if(G&&(G.sizcache!==D||!e.nodeIndex)){var C=0;for(z=G.firstChild;z;z=z.nextSibling){if(z.nodeType===1){z.nodeIndex=++C}}G.sizcache=D}var F=e.nodeIndex-H;if(A==0){return F==0}else{return(F%A==0&&F/A>=0)}}},ID:function(z,e){return z.nodeType===1&&z.getAttribute("id")===e},TAG:function(z,e){return(e==="*"&&z.nodeType===1)||z.nodeName===e},CLASS:function(z,e){return(" "+(z.className||z.getAttribute("class"))+" ").indexOf(e)>-1},ATTR:function(D,B){var A=B[1],e=h.attrHandle[A]?h.attrHandle[A](D):D[A]!=null?D[A]:D.getAttribute(A),E=e+"",C=B[2],z=B[4];return e==null?C==="!=":C==="="?E===z:C==="*="?E.indexOf(z)>=0:C==="~="?(" "+E+" ").indexOf(z)>=0:!z?E&&e!==false:C==="!="?E!=z:C==="^="?E.indexOf(z)===0:C==="$="?E.substr(E.length-z.length)===z:C==="|="?E===z||E.substr(0,z.length+1)===z+"-":false},POS:function(C,z,A,D){var e=z[2],B=h.setFilters[e];if(B){return B(C,A,z,D)}}}};var q=h.match.POS;for(var s in h.match){h.match[s]=new RegExp(h.match[s].source+/(?![^\[]*\])(?![^\(]*\))/.source);h.leftMatch[s]=new RegExp(/(^(?:.|\r|\n)*?)/.source+h.match[s].source)}var b=function(z,e){z=Array.prototype.slice.call(z,0);if(e){e.push.apply(e,z);return e}return z};try{Array.prototype.slice.call(document.documentElement.childNodes,0)}catch(r){b=function(C,B){var z=B||[];if(g.call(C)==="[object Array]"){Array.prototype.push.apply(z,C)}else{if(typeof C.length==="number"){for(var A=0,e=C.length;A<e;A++){z.push(C[A])}}else{for(var A=0;C[A];A++){z.push(C[A])}}}return z}}var f;if(document.documentElement.compareDocumentPosition){f=function(z,e){if(!z.compareDocumentPosition||!e.compareDocumentPosition){if(z==e){u=true}return 0}var A=z.compareDocumentPosition(e)&4?-1:z===e?0:1;if(A===0){u=true}return A}}else{if("sourceIndex" in document.documentElement){f=function(z,e){if(!z.sourceIndex||!e.sourceIndex){if(z==e){u=true}return 0}var A=z.sourceIndex-e.sourceIndex;if(A===0){u=true}return A}}else{if(document.createRange){f=function(B,z){if(!B.ownerDocument||!z.ownerDocument){if(B==z){u=true}return 0}var A=B.ownerDocument.createRange(),e=z.ownerDocument.createRange();A.setStart(B,0);A.setEnd(B,0);e.setStart(z,0);e.setEnd(z,0);var C=A.compareBoundaryPoints(Range.START_TO_END,e);if(C===0){u=true}return C}}}}(function(){var z=document.createElement("div"),A="script"+(new Date).getTime();z.innerHTML="<a name='"+A+"'/>";var e=document.documentElement;e.insertBefore(z,e.firstChild);if(!!document.getElementById(A)){h.find.ID=function(C,D,E){if(typeof D.getElementById!=="undefined"&&!E){var B=D.getElementById(C[1]);return B?B.id===C[1]||typeof B.getAttributeNode!=="undefined"&&B.getAttributeNode("id").nodeValue===C[1]?[B]:undefined:[]}};h.filter.ID=function(D,B){var C=typeof D.getAttributeNode!=="undefined"&&D.getAttributeNode("id");return D.nodeType===1&&C&&C.nodeValue===B}}e.removeChild(z);e=z=null})();(function(){var e=document.createElement("div");e.appendChild(document.createComment(""));if(e.getElementsByTagName("*").length>0){h.find.TAG=function(z,D){var C=D.getElementsByTagName(z[1]);if(z[1]==="*"){var B=[];for(var A=0;C[A];A++){if(C[A].nodeType===1){B.push(C[A])}}C=B}return C}}e.innerHTML="<a href='#'></a>";if(e.firstChild&&typeof e.firstChild.getAttribute!=="undefined"&&e.firstChild.getAttribute("href")!=="#"){h.attrHandle.href=function(z){return z.getAttribute("href",2)}}e=null})();if(document.querySelectorAll){(function(){var e=d,A=document.createElement("div");A.innerHTML="<p class='TEST'></p>";if(A.querySelectorAll&&A.querySelectorAll(".TEST").length===0){return}d=function(E,D,B,C){D=D||document;if(!C&&D.nodeType===9&&!v(D)){try{return b(D.querySelectorAll(E),B)}catch(F){}}return e(E,D,B,C)};for(var z in e){d[z]=e[z]}A=null})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var e=document.createElement("div");e.innerHTML="<div class='test e'></div><div class='test'></div>";if(e.getElementsByClassName("e").length===0){return}e.lastChild.className="e";if(e.getElementsByClassName("e").length===1){return}h.order.splice(1,0,"CLASS");h.find.CLASS=function(z,A,B){if(typeof A.getElementsByClassName!=="undefined"&&!B){return A.getElementsByClassName(z[1])}};e=null})()}function t(z,E,D,I,F,H){var G=z=="previousSibling"&&!H;for(var B=0,A=I.length;B<A;B++){var e=I[B];if(e){if(G&&e.nodeType===1){e.sizcache=D;e.sizset=B}e=e[z];var C=false;while(e){if(e.sizcache===D){C=I[e.sizset];break}if(e.nodeType===1&&!H){e.sizcache=D;e.sizset=B}if(e.nodeName===E){C=e;break}e=e[z]}I[B]=C}}}function y(z,E,D,I,F,H){var G=z=="previousSibling"&&!H;for(var B=0,A=I.length;B<A;B++){var e=I[B];if(e){if(G&&e.nodeType===1){e.sizcache=D;e.sizset=B}e=e[z];var C=false;while(e){if(e.sizcache===D){C=I[e.sizset];break}if(e.nodeType===1){if(!H){e.sizcache=D;e.sizset=B}if(typeof E!=="string"){if(e===E){C=true;break}}else{if(d.filter(E,[e]).length>0){C=e;break}}}e=e[z]}I[B]=C}}}var n=document.compareDocumentPosition?function(z,e){return z.compareDocumentPosition(e)&16}:function(z,e){return z!==e&&(z.contains?z.contains(e):true)};var v=function(e){return e.nodeType===9&&e.documentElement.nodeName!=="HTML"||!!e.ownerDocument&&e.ownerDocument.documentElement.nodeName!=="HTML"};var l=function(e,F){var B=[],C="",D,A=F.nodeType?[F]:F;while((D=h.match.PSEUDO.exec(e))){C+=D[0];e=e.replace(h.match.PSEUDO,"")}e=h.relative[e]?e+"*":e;for(var E=0,z=A.length;E<z;E++){d(e,A[E],B)}return d.filter(C,B)};window.Sizzle=d})();(function(e){var f=Prototype.Selector.extendElements;function b(g,h){return f(e(g,h||document))}function d(h,g){return e.matches(g,[h]).length==1}Prototype.Selector.engine=e;Prototype.Selector.select=b;Prototype.Selector.match=d})(Sizzle);window.Sizzle=Prototype._original_property;delete Prototype._original_property;var Form={reset:function(b){b=$(b);b.reset();return b},serializeElements:function(n,f){if(typeof f!="object"){f={hash:!!f}}else{if(Object.isUndefined(f.hash)){f.hash=true}}var g,l,b=false,h=f.submit,d,e;if(f.hash){e={};d=function(o,p,q){if(p in o){if(!Object.isArray(o[p])){o[p]=[o[p]]}o[p].push(q)}else{o[p]=q}return o}}else{e="";d=function(o,p,q){return o+(o?"&":"")+encodeURIComponent(p)+"="+encodeURIComponent(q)}}return n.inject(e,function(o,p){if(!p.disabled&&p.name){g=p.name;l=$(p).getValue();if(l!=null&&p.type!="file"&&(p.type!="submit"||(!b&&h!==false&&(!h||g==h)&&(b=true)))){o=d(o,g,l)}}return o})}};Form.Methods={serialize:function(d,b){return Form.serializeElements(Form.getElements(d),b)},getElements:function(g){var h=$(g).getElementsByTagName("*"),f,b=[],e=Form.Element.Serializers;for(var d=0;f=h[d];d++){b.push(f)}return b.inject([],function(l,n){if(e[n.tagName.toLowerCase()]){l.push(Element.extend(n))}return l})},getInputs:function(l,e,f){l=$(l);var b=l.getElementsByTagName("input");if(!e&&!f){return $A(b).map(Element.extend)}for(var g=0,n=[],h=b.length;g<h;g++){var d=b[g];if((e&&d.type!=e)||(f&&d.name!=f)){continue}n.push(Element.extend(d))}return n},disable:function(b){b=$(b);Form.getElements(b).invoke("disable");return b},enable:function(b){b=$(b);Form.getElements(b).invoke("enable");return b},findFirstElement:function(d){var e=$(d).getElements().findAll(function(f){return"hidden"!=f.type&&!f.disabled});var b=e.findAll(function(f){return f.hasAttribute("tabIndex")&&f.tabIndex>=0}).sortBy(function(f){return f.tabIndex}).first();return b?b:e.find(function(f){return/^(?:input|select|textarea)$/i.test(f.tagName)})},focusFirstElement:function(d){d=$(d);var b=d.findFirstElement();if(b){b.activate()}return d},request:function(d,b){d=$(d),b=Object.clone(b||{});var f=b.parameters,e=d.readAttribute("action")||"";if(e.blank()){e=window.location.href}b.parameters=d.serialize(true);if(f){if(Object.isString(f)){f=f.toQueryParams()}Object.extend(b.parameters,f)}if(d.hasAttribute("method")&&!b.method){b.method=d.method}return new Ajax.Request(e,b)}};Form.Element={focus:function(b){$(b).focus();return b},select:function(b){$(b).select();return b}};Form.Element.Methods={serialize:function(b){b=$(b);if(!b.disabled&&b.name){var d=b.getValue();if(d!=undefined){var e={};e[b.name]=d;return Object.toQueryString(e)}}return""},getValue:function(b){b=$(b);var d=b.tagName.toLowerCase();return Form.Element.Serializers[d](b)},setValue:function(b,d){b=$(b);var e=b.tagName.toLowerCase();Form.Element.Serializers[e](b,d);return b},clear:function(b){$(b).value="";return b},present:function(b){return $(b).value!=""},activate:function(b){b=$(b);try{b.focus();if(b.select&&(b.tagName.toLowerCase()!="input"||!(/^(?:button|reset|submit)$/i.test(b.type)))){b.select()}}catch(d){}return b},disable:function(b){b=$(b);b.disabled=true;return b},enable:function(b){b=$(b);b.disabled=false;return b}};var Field=Form.Element;var $F=Form.Element.Methods.getValue;Form.Element.Serializers=(function(){function d(n,o){switch(n.type.toLowerCase()){case"checkbox":case"radio":return h(n,o);default:return g(n,o)}}function h(n,o){if(Object.isUndefined(o)){return n.checked?n.value:null}else{n.checked=!!o}}function g(n,o){if(Object.isUndefined(o)){return n.value}else{n.value=o}}function b(p,s){if(Object.isUndefined(s)){return(p.type==="select-one"?e:f)(p)}var o,q,t=!Object.isArray(s);for(var n=0,r=p.length;n<r;n++){o=p.options[n];q=this.optionValue(o);if(t){if(q==s){o.selected=true;return}}else{o.selected=s.include(q)}}}function e(o){var n=o.selectedIndex;return n>=0?l(o.options[n]):null}function f(q){var n,r=q.length;if(!r){return null}for(var p=0,n=[];p<r;p++){var o=q.options[p];if(o.selected){n.push(l(o))}}return n}function l(n){return Element.hasAttribute(n,"value")?n.value:n.text}return{input:d,inputSelector:h,textarea:g,select:b,selectOne:e,selectMany:f,optionValue:l,button:g}})();Abstract.TimedObserver=Class.create(PeriodicalExecuter,{initialize:function($super,b,d,e){$super(e,d);this.element=$(b);this.lastValue=this.getValue()},execute:function(){var b=this.getValue();if(Object.isString(this.lastValue)&&Object.isString(b)?this.lastValue!=b:String(this.lastValue)!=String(b)){this.callback(this.element,b);this.lastValue=b}}});Form.Element.Observer=Class.create(Abstract.TimedObserver,{getValue:function(){return Form.Element.getValue(this.element)}});Form.Observer=Class.create(Abstract.TimedObserver,{getValue:function(){return Form.serialize(this.element)}});Abstract.EventObserver=Class.create({initialize:function(b,d){this.element=$(b);this.callback=d;this.lastValue=this.getValue();if(this.element.tagName.toLowerCase()=="form"){this.registerFormCallbacks()}else{this.registerCallback(this.element)}},onElementEvent:function(){var b=this.getValue();if(this.lastValue!=b){this.callback(this.element,b);this.lastValue=b}},registerFormCallbacks:function(){Form.getElements(this.element).each(this.registerCallback,this)},registerCallback:function(b){if(b.type){switch(b.type.toLowerCase()){case"checkbox":case"radio":Event.observe(b,"click",this.onElementEvent.bind(this));break;default:Event.observe(b,"change",this.onElementEvent.bind(this));break}}}});Form.Element.EventObserver=Class.create(Abstract.EventObserver,{getValue:function(){return Form.Element.getValue(this.element)}});Form.EventObserver=Class.create(Abstract.EventObserver,{getValue:function(){return Form.serialize(this.element)}});(function(){var J={KEY_BACKSPACE:8,KEY_TAB:9,KEY_RETURN:13,KEY_ESC:27,KEY_LEFT:37,KEY_UP:38,KEY_RIGHT:39,KEY_DOWN:40,KEY_DELETE:46,KEY_HOME:36,KEY_END:35,KEY_PAGEUP:33,KEY_PAGEDOWN:34,KEY_INSERT:45,cache:{}};var h=document.documentElement;var K="onmouseenter" in h&&"onmouseleave" in h;var b=function(L){return false};if(window.attachEvent){if(window.addEventListener){b=function(L){return !(L instanceof window.Event)}}else{b=function(L){return true}}}var y;function H(M,L){return M.which?(M.which===L+1):(M.button===L)}var u={0:1,1:4,2:2};function F(M,L){return M.button===u[L]}function I(M,L){switch(L){case 0:return M.which==1&&!M.metaKey;case 1:return M.which==2||(M.which==1&&M.metaKey);case 2:return M.which==3;default:return false}}if(window.attachEvent){if(!window.addEventListener){y=F}else{y=function(M,L){return b(M)?F(M,L):H(M,L)}}}else{if(Prototype.Browser.WebKit){y=I}else{y=H}}function C(L){return y(L,0)}function A(L){return y(L,1)}function t(L){return y(L,2)}function f(N){N=J.extend(N);var M=N.target,L=N.type,O=N.currentTarget;if(O&&O.tagName){if(L==="load"||L==="error"||(L==="click"&&O.tagName.toLowerCase()==="input"&&O.type==="radio")){M=O}}if(M.nodeType==Node.TEXT_NODE){M=M.parentNode}return Element.extend(M)}function v(M,N){var L=J.element(M);if(!N){return L}while(L){if(Object.isElement(L)&&Prototype.Selector.match(L,N)){return Element.extend(L)}L=L.parentNode}}function z(L){return{x:e(L),y:d(L)}}function e(N){var M=document.documentElement,L=document.body||{scrollLeft:0};return N.pageX||(N.clientX+(M.scrollLeft||L.scrollLeft)-(M.clientLeft||0))}function d(N){var M=document.documentElement,L=document.body||{scrollTop:0};return N.pageY||(N.clientY+(M.scrollTop||L.scrollTop)-(M.clientTop||0))}function w(L){J.extend(L);L.preventDefault();L.stopPropagation();L.stopped=true}J.Methods={isLeftClick:C,isMiddleClick:A,isRightClick:t,element:f,findElement:v,pointer:z,pointerX:e,pointerY:d,stop:w};var E=Object.keys(J.Methods).inject({},function(L,M){L[M]=J.Methods[M].methodize();return L});if(window.attachEvent){function o(M){var L;switch(M.type){case"mouseover":case"mouseenter":L=M.fromElement;break;case"mouseout":case"mouseleave":L=M.toElement;break;default:return null}return Element.extend(L)}var B={stopPropagation:function(){this.cancelBubble=true},preventDefault:function(){this.returnValue=false},inspect:function(){return"[object Event]"}};J.extend=function(M,L){if(!M){return false}if(!b(M)){return M}if(M._extendedByPrototype){return M}M._extendedByPrototype=Prototype.emptyFunction;var N=J.pointer(M);Object.extend(M,{target:M.srcElement||L,relatedTarget:o(M),pageX:N.x,pageY:N.y});Object.extend(M,E);Object.extend(M,B);return M}}else{J.extend=Prototype.K}if(window.addEventListener){J.prototype=window.Event.prototype||document.createEvent("HTMLEvents").__proto__;Object.extend(J.prototype,E)}function s(P,O,Q){var N=Element.retrieve(P,"prototype_event_registry");if(Object.isUndefined(N)){g.push(P);N=Element.retrieve(P,"prototype_event_registry",$H())}var L=N.get(O);if(Object.isUndefined(L)){L=[];N.set(O,L)}if(L.pluck("handler").include(Q)){return false}var M;if(O.include(":")){M=function(R){if(Object.isUndefined(R.eventName)){return false}if(R.eventName!==O){return false}J.extend(R,P);Q.call(P,R)}}else{if(!K&&(O==="mouseenter"||O==="mouseleave")){if(O==="mouseenter"||O==="mouseleave"){M=function(S){J.extend(S,P);var R=S.relatedTarget;while(R&&R!==P){try{R=R.parentNode}catch(T){R=P}}if(R===P){return}Q.call(P,S)}}}else{M=function(R){J.extend(R,P);Q.call(P,R)}}}M.handler=Q;L.push(M);return M}function n(){for(var L=0,M=g.length;L<M;L++){J.stopObserving(g[L]);g[L]=null}}var g=[];if(Prototype.Browser.IE){window.attachEvent("onunload",n)}if(Prototype.Browser.WebKit){window.addEventListener("unload",Prototype.emptyFunction,false)}var r=Prototype.K,l={mouseenter:"mouseover",mouseleave:"mouseout"};if(!K){r=function(L){return(l[L]||L)}}function D(O,N,P){O=$(O);var M=s(O,N,P);if(!M){return O}if(N.include(":")){if(O.addEventListener){O.addEventListener("dataavailable",M,false)}else{O.attachEvent("ondataavailable",M);O.attachEvent("onlosecapture",M)}}else{var L=r(N);if(O.addEventListener){O.addEventListener(L,M,false)}else{O.attachEvent("on"+L,M)}}return O}function q(R,O,S){R=$(R);var N=Element.retrieve(R,"prototype_event_registry");if(!N){return R}if(!O){N.each(function(U){var T=U.key;q(R,T)});return R}var P=N.get(O);if(!P){return R}if(!S){P.each(function(T){q(R,O,T.handler)});return R}var Q=P.length,M;while(Q--){if(P[Q].handler===S){M=P[Q];break}}if(!M){return R}if(O.include(":")){if(R.removeEventListener){R.removeEventListener("dataavailable",M,false)}else{R.detachEvent("ondataavailable",M);R.detachEvent("onlosecapture",M)}}else{var L=r(O);if(R.removeEventListener){R.removeEventListener(L,M,false)}else{R.detachEvent("on"+L,M)}}N.set(O,P.without(M));return R}function G(O,N,M,L){O=$(O);if(Object.isUndefined(L)){L=true}if(O==document&&document.createEvent&&!O.dispatchEvent){O=document.documentElement}var P;if(document.createEvent){P=document.createEvent("HTMLEvents");P.initEvent("dataavailable",L,true)}else{P=document.createEventObject();P.eventType=L?"ondataavailable":"onlosecapture"}P.eventName=N;P.memo=M||{};if(document.createEvent){O.dispatchEvent(P)}else{O.fireEvent(P.eventType,P)}return J.extend(P)}J.Handler=Class.create({initialize:function(N,M,L,O){this.element=$(N);this.eventName=M;this.selector=L;this.callback=O;this.handler=this.handleEvent.bind(this)},start:function(){J.observe(this.element,this.eventName,this.handler);return this},stop:function(){J.stopObserving(this.element,this.eventName,this.handler);return this},handleEvent:function(M){var L=J.findElement(M,this.selector);if(L){this.callback.call(this.element,M,L)}}});function p(N,M,L,O){N=$(N);if(Object.isFunction(L)&&Object.isUndefined(O)){O=L,L=null}return new J.Handler(N,M,L,O).start()}Object.extend(J,J.Methods);Object.extend(J,{fire:G,observe:D,stopObserving:q,on:p});Element.addMethods({fire:G,observe:D,stopObserving:q,on:p});Object.extend(document,{fire:G.methodize(),observe:D.methodize(),stopObserving:q.methodize(),on:p.methodize(),loaded:false});if(window.Event){Object.extend(window.Event,J)}else{window.Event=J}})();(function(){var e;function b(){if(document.loaded){return}if(e){window.clearTimeout(e)}document.loaded=true;document.fire("dom:loaded")}function d(){if(document.readyState==="complete"){document.stopObserving("readystatechange",d);b()}}if(document.addEventListener){document.addEventListener("DOMContentLoaded",b,false)}else{document.observe("readystatechange",d);if(window==top){var e=window.setInterval(function(){try{document.documentElement.doScroll("left")}catch(f){return}window.clearInterval(e);b()},5)}}Event.observe(window,"load",b)})();Element.addMethods();Hash.toQueryString=Object.toQueryString;var Toggle={display:Element.toggle};Element.Methods.childOf=Element.Methods.descendantOf;var Insertion={Before:function(b,d){return Element.insert(b,{before:d})},Top:function(b,d){return Element.insert(b,{top:d})},Bottom:function(b,d){return Element.insert(b,{bottom:d})},After:function(b,d){return Element.insert(b,{after:d})}};var $continue=new Error('"throw $continue" is deprecated, use "return" instead');var Position={includeScrollOffsets:false,prepare:function(){this.deltaX=window.pageXOffset||document.documentElement.scrollLeft||document.body.scrollLeft||0;this.deltaY=window.pageYOffset||document.documentElement.scrollTop||document.body.scrollTop||0},within:function(d,b,e){if(this.includeScrollOffsets){return this.withinIncludingScrolloffsets(d,b,e)}this.xcomp=b;this.ycomp=e;this.offset=Element.cumulativeOffset(d);return(e>=this.offset[1]&&e<this.offset[1]+d.offsetHeight&&b>=this.offset[0]&&b<this.offset[0]+d.offsetWidth)},withinIncludingScrolloffsets:function(d,b,f){var e=Element.cumulativeScrollOffset(d);this.xcomp=b+e[0]-this.deltaX;this.ycomp=f+e[1]-this.deltaY;this.offset=Element.cumulativeOffset(d);return(this.ycomp>=this.offset[1]&&this.ycomp<this.offset[1]+d.offsetHeight&&this.xcomp>=this.offset[0]&&this.xcomp<this.offset[0]+d.offsetWidth)},overlap:function(d,b){if(!d){return 0}if(d=="vertical"){return((this.offset[1]+b.offsetHeight)-this.ycomp)/b.offsetHeight}if(d=="horizontal"){return((this.offset[0]+b.offsetWidth)-this.xcomp)/b.offsetWidth}},cumulativeOffset:Element.Methods.cumulativeOffset,positionedOffset:Element.Methods.positionedOffset,absolutize:function(b){Position.prepare();return Element.absolutize(b)},relativize:function(b){Position.prepare();return Element.relativize(b)},realOffset:Element.Methods.cumulativeScrollOffset,offsetParent:Element.Methods.getOffsetParent,page:Element.Methods.viewportOffset,clone:function(d,e,b){b=b||{};return Element.clonePosition(e,d,b)}};if(!document.getElementsByClassName){document.getElementsByClassName=function(d){function b(e){return e.blank()?null:"[contains(concat(' ', @class, ' '), ' "+e+" ')]"}d.getElementsByClassName=Prototype.BrowserFeatures.XPath?function(e,g){g=g.toString().strip();var f=/\s/.test(g)?$w(g).map(b).join(""):b(g);return f?document._getElementsByXPath(".//*"+f,e):[]}:function(g,h){h=h.toString().strip();var l=[],n=(/\s/.test(h)?$w(h):null);if(!n&&!h){return l}var e=$(g).getElementsByTagName("*");h=" "+h+" ";for(var f=0,p,o;p=e[f];f++){if(p.className&&(o=" "+p.className+" ")&&(o.include(h)||(n&&n.all(function(q){return !q.toString().blank()&&o.include(" "+q+" ")})))){l.push(Element.extend(p))}}return l};return function(f,e){return $(e||document.body).getElementsByClassName(f)}}(Element.Methods)}Element.ClassNames=Class.create();Element.ClassNames.prototype={initialize:function(b){this.element=$(b)},_each:function(b){this.element.className.split(/\s+/).select(function(d){return d.length>0})._each(b)},set:function(b){this.element.className=b},add:function(b){if(this.include(b)){return}this.set($A(this).concat(b).join(" "))},remove:function(b){if(!this.include(b)){return}this.set($A(this).without(b).join(" "))},toString:function(){return $A(this).join(" ")}};Object.extend(Element.ClassNames.prototype,Enumerable);(function(){window.Selector=Class.create({initialize:function(b){this.expression=b.strip()},findElements:function(b){return Prototype.Selector.select(this.expression,b)},match:function(b){return Prototype.Selector.match(b,this.expression)},toString:function(){return this.expression},inspect:function(){return"#<Selector: "+this.expression+">"}});Object.extend(Selector,{matchElements:function(h,l){var b=Prototype.Selector.match,f=[];for(var e=0,g=h.length;e<g;e++){var d=h[e];if(b(d,l)){f.push(Element.extend(d))}}return f},findElement:function(h,l,d){d=d||0;var b=0,f;for(var e=0,g=h.length;e<g;e++){f=h[e];if(Prototype.Selector.match(f,l)&&d===b++){return Element.extend(f)}}},findChildElements:function(d,e){var b=e.toArray().join(", ");return Prototype.Selector.select(b,d||document)}})})();var Window=Class.create();Window.keepMultiModalWindow=false;Window.hasEffectLib=(typeof Effect!="undefined");Window.resizeEffectDuration=0.4;Window.prototype={initialize:function(){var e;var d=0;if(arguments.length>0){if(typeof arguments[0]=="string"){e=arguments[0];d=1}else{e=arguments[0]?arguments[0].id:null}}if(!e){e="window_"+new Date().getTime()}if($(e)){alert("Window "+e+" is already registered in the DOM! Make sure you use setDestroyOnClose() or destroyOnClose: true in the constructor")}this.options=Object.extend({className:"dialog",windowClassName:null,blurClassName:null,minWidth:100,minHeight:20,resizable:true,closable:true,minimizable:true,maximizable:true,draggable:true,userData:null,showEffect:(Window.hasEffectLib?Effect.Appear:Element.show),hideEffect:(Window.hasEffectLib?Effect.Fade:Element.hide),showEffectOptions:{},hideEffectOptions:{},effectOptions:null,parent:document.body,title:"&nbsp;",url:null,onload:Prototype.emptyFunction,width:200,height:300,opacity:1,recenterAuto:true,wiredDrag:false,closeOnEsc:true,closeCallback:null,destroyOnClose:false,gridX:1,gridY:1},arguments[d]||{});if(this.options.blurClassName){this.options.focusClassName=this.options.className}if(typeof this.options.top=="undefined"&&typeof this.options.bottom=="undefined"){this.options.top=this._round(Math.random()*500,this.options.gridY)}if(typeof this.options.left=="undefined"&&typeof this.options.right=="undefined"){this.options.left=this._round(Math.random()*500,this.options.gridX)}if(this.options.effectOptions){Object.extend(this.options.hideEffectOptions,this.options.effectOptions);Object.extend(this.options.showEffectOptions,this.options.effectOptions);if(this.options.showEffect==Element.Appear){this.options.showEffectOptions.to=this.options.opacity}}if(Window.hasEffectLib){if(this.options.showEffect==Effect.Appear){this.options.showEffectOptions.to=this.options.opacity}if(this.options.hideEffect==Effect.Fade){this.options.hideEffectOptions.from=this.options.opacity}}if(this.options.hideEffect==Element.hide){this.options.hideEffect=function(){Element.hide(this.element);if(this.options.destroyOnClose){this.destroy()}}.bind(this)}if(this.options.parent!=document.body){this.options.parent=$(this.options.parent)}this.element=this._createWindow(e);this.element.win=this;this.eventMouseDown=this._initDrag.bindAsEventListener(this);this.eventMouseUp=this._endDrag.bindAsEventListener(this);this.eventMouseMove=this._updateDrag.bindAsEventListener(this);this.eventOnLoad=this._getWindowBorderSize.bindAsEventListener(this);this.eventMouseDownContent=this.toFront.bindAsEventListener(this);this.eventResize=this._recenter.bindAsEventListener(this);this.eventKeyUp=this._keyUp.bindAsEventListener(this);this.topbar=$(this.element.id+"_top");this.bottombar=$(this.element.id+"_bottom");this.content=$(this.element.id+"_content");Event.observe(this.topbar,"mousedown",this.eventMouseDown);Event.observe(this.bottombar,"mousedown",this.eventMouseDown);Event.observe(this.content,"mousedown",this.eventMouseDownContent);Event.observe(window,"load",this.eventOnLoad);Event.observe(window,"resize",this.eventResize);Event.observe(window,"scroll",this.eventResize);Event.observe(document,"keyup",this.eventKeyUp);Event.observe(this.options.parent,"scroll",this.eventResize);if(this.options.draggable){var b=this;[this.topbar,this.topbar.up().previous(),this.topbar.up().next()].each(function(f){f.observe("mousedown",b.eventMouseDown);f.addClassName("top_draggable")});[this.bottombar.up(),this.bottombar.up().previous(),this.bottombar.up().next()].each(function(f){f.observe("mousedown",b.eventMouseDown);f.addClassName("bottom_draggable")})}if(this.options.resizable){this.sizer=$(this.element.id+"_sizer");Event.observe(this.sizer,"mousedown",this.eventMouseDown)}this.useLeft=null;this.useTop=null;if(typeof this.options.left!="undefined"){this.element.setStyle({left:parseFloat(this.options.left)+"px"});this.useLeft=true}else{this.element.setStyle({right:parseFloat(this.options.right)+"px"});this.useLeft=false}if(typeof this.options.top!="undefined"){this.element.setStyle({top:parseFloat(this.options.top)+"px"});this.useTop=true}else{this.element.setStyle({bottom:parseFloat(this.options.bottom)+"px"});this.useTop=false}this.storedLocation=null;this.setOpacity(this.options.opacity);if(this.options.zIndex){this.setZIndex(this.options.zIndex)}else{this.setZIndex(this.getMaxZIndex())}if(this.options.destroyOnClose){this.setDestroyOnClose(true)}this._getWindowBorderSize();this.width=this.options.width;this.height=this.options.height;this.visible=false;this.constraint=false;this.constraintPad={top:0,left:0,bottom:0,right:0};if(this.width&&this.height){this.setSize(this.options.width,this.options.height)}this.setTitle(this.options.title);Windows.register(this)},getMaxZIndex:function(){var b=0,d;var g=document.body.childNodes;for(d=0;d<g.length;d++){var e=g[d];var f=e.nodeType==1?parseInt(e.style.zIndex,10)||0:0;if(f<10000){b=Math.max(b,f)}}return b+10},destroy:function(){this._notify("onDestroy");Event.stopObserving(this.topbar,"mousedown",this.eventMouseDown);Event.stopObserving(this.bottombar,"mousedown",this.eventMouseDown);Event.stopObserving(this.content,"mousedown",this.eventMouseDownContent);Event.stopObserving(window,"load",this.eventOnLoad);Event.stopObserving(window,"resize",this.eventResize);Event.stopObserving(window,"scroll",this.eventResize);Event.stopObserving(this.content,"load",this.options.onload);Event.stopObserving(document,"keyup",this.eventKeyUp);if(this._oldParent){var e=this.getContent();var b=null;for(var d=0;d<e.childNodes.length;d++){b=e.childNodes[d];if(b.nodeType==1){break}b=null}if(b){this._oldParent.appendChild(b)}this._oldParent=null}if(this.sizer){Event.stopObserving(this.sizer,"mousedown",this.eventMouseDown)}if(this.options.url){this.content.src=null}if(this.iefix){Element.remove(this.iefix)}Element.remove(this.element);Windows.unregister(this)},setCloseCallback:function(b){this.options.closeCallback=b},getContent:function(){return this.content},setContent:function(n,l,e){var b=$(n);if(null==b){throw"Unable to find element '"+n+"' in DOM"}this._oldParent=b.parentNode;var h=null;var g=null;if(l){h=Element.getDimensions(b)}if(e){g=Position.cumulativeOffset(b)}var f=this.getContent();this.setHTMLContent("");f=this.getContent();f.appendChild(b);b.show();if(l){this.setSize(h.width,h.height)}if(e){this.setLocation(g[1]-this.heightN,g[0]-this.widthW)}},setHTMLContent:function(b){if(this.options.url){this.content.src=null;this.options.url=null;var d='<div id="'+this.getId()+'_content" class="'+this.options.className+'_content"> </div>';$(this.getId()+"_table_content").innerHTML=d;this.content=$(this.element.id+"_content")}this.getContent().innerHTML=b},setAjaxContent:function(d,b,f,e){this.showFunction=f?"showCenter":"show";this.showModal=e||false;b=b||{};this.setHTMLContent("");this.onComplete=b.onComplete;if(!this._onCompleteHandler){this._onCompleteHandler=this._setAjaxContent.bind(this)}b.onComplete=this._onCompleteHandler;new Ajax.Request(d,b);b.onComplete=this.onComplete},_setAjaxContent:function(b){Element.update(this.getContent(),b.responseText);if(this.onComplete){this.onComplete(b)}this.onComplete=null;this[this.showFunction](this.showModal)},setURL:function(b){if(this.options.url){this.content.src=null}this.options.url=b;var d="<iframe frameborder='0' name='"+this.getId()+"_content'  id='"+this.getId()+"_content' src='"+b+"' width='"+this.width+"' height='"+this.height+"'> </iframe>";$(this.getId()+"_table_content").innerHTML=d;this.content=$(this.element.id+"_content")},getURL:function(){return this.options.url?this.options.url:null},refresh:function(){if(this.options.url){$(this.element.getAttribute("id")+"_content").src=this.options.url}},setCookie:function(d,e,t,g,b){d=d||this.element.id;this.cookie=[d,e,t,g,b];var r=WindowUtilities.getCookie(d);if(r){var s=r.split(",");var p=s[0].split(":");var o=s[1].split(":");var q=parseFloat(s[2]),l=parseFloat(s[3]);var n=s[4];var f=s[5];this.setSize(q,l);if(n=="true"){this.doMinimize=true}else{if(f=="true"){this.doMaximize=true}}this.useLeft=p[0]=="l";this.useTop=o[0]=="t";this.element.setStyle(this.useLeft?{left:p[1]}:{right:p[1]});this.element.setStyle(this.useTop?{top:o[1]}:{bottom:o[1]})}},getId:function(){return this.element.id},setDestroyOnClose:function(){this.options.destroyOnClose=true},setConstraint:function(b,d){this.constraint=b;this.constraintPad=Object.extend(this.constraintPad,d||{});if(this.useTop&&this.useLeft){this.setLocation(parseFloat(this.element.style.top),parseFloat(this.element.style.left))}},_initDrag:function(d){if(Event.element(d)==this.sizer&&this.isMinimized()){return}if(Event.element(d)!=this.sizer&&this.isMaximized()){return}if(Prototype.Browser.IE&&this.heightN==0){this._getWindowBorderSize()}this.pointer=[this._round(Event.pointerX(d),this.options.gridX),this._round(Event.pointerY(d),this.options.gridY)];if(this.options.wiredDrag){this.currentDrag=this._createWiredElement()}else{this.currentDrag=this.element}if(Event.element(d)==this.sizer){this.doResize=true;this.widthOrg=this.width;this.heightOrg=this.height;this.bottomOrg=parseFloat(this.element.getStyle("bottom"));this.rightOrg=parseFloat(this.element.getStyle("right"));this._notify("onStartResize")}else{this.doResize=false;var b=$(this.getId()+"_close");if(b&&Position.within(b,this.pointer[0],this.pointer[1])){this.currentDrag=null;return}this.toFront();if(!this.options.draggable){return}this._notify("onStartMove")}Event.observe(document,"mouseup",this.eventMouseUp,false);Event.observe(document,"mousemove",this.eventMouseMove,false);WindowUtilities.disableScreen("__invisible__","__invisible__",this.overlayOpacity);document.body.ondrag=function(){return false};document.body.onselectstart=function(){return false};this.currentDrag.show();Event.stop(d)},_round:function(d,b){return b==1?d:d=Math.floor(d/b)*b},_updateDrag:function(d){var b=[this._round(Event.pointerX(d),this.options.gridX),this._round(Event.pointerY(d),this.options.gridY)];var q=b[0]-this.pointer[0];var p=b[1]-this.pointer[1];if(this.doResize){var o=this.widthOrg+q;var f=this.heightOrg+p;q=this.width-this.widthOrg;p=this.height-this.heightOrg;if(this.useLeft){o=this._updateWidthConstraint(o)}else{this.currentDrag.setStyle({right:(this.rightOrg-q)+"px"})}if(this.useTop){f=this._updateHeightConstraint(f)}else{this.currentDrag.setStyle({bottom:(this.bottomOrg-p)+"px"})}this.setSize(o,f);this._notify("onResize")}else{this.pointer=b;if(this.useLeft){var e=parseFloat(this.currentDrag.getStyle("left"))+q;var n=this._updateLeftConstraint(e);this.pointer[0]+=n-e;this.currentDrag.setStyle({left:n+"px"})}else{this.currentDrag.setStyle({right:parseFloat(this.currentDrag.getStyle("right"))-q+"px"})}if(this.useTop){var l=parseFloat(this.currentDrag.getStyle("top"))+p;var g=this._updateTopConstraint(l);this.pointer[1]+=g-l;this.currentDrag.setStyle({top:g+"px"})}else{this.currentDrag.setStyle({bottom:parseFloat(this.currentDrag.getStyle("bottom"))-p+"px"})}this._notify("onMove")}if(this.iefix){this._fixIEOverlapping()}this._removeStoreLocation();Event.stop(d)},_endDrag:function(b){WindowUtilities.enableScreen("__invisible__");if(this.doResize){this._notify("onEndResize")}else{this._notify("onEndMove")}Event.stopObserving(document,"mouseup",this.eventMouseUp,false);Event.stopObserving(document,"mousemove",this.eventMouseMove,false);Event.stop(b);this._hideWiredElement();this._saveCookie();document.body.ondrag=null;document.body.onselectstart=null},_updateLeftConstraint:function(d){if(this.constraint&&this.useLeft&&this.useTop){var b=this.options.parent==document.body?WindowUtilities.getPageSize().windowWidth:this.options.parent.getDimensions().width;if(d<this.constraintPad.left){d=this.constraintPad.left}if(d+this.width+this.widthE+this.widthW>b-this.constraintPad.right){d=b-this.constraintPad.right-this.width-this.widthE-this.widthW}}return d},_updateTopConstraint:function(e){if(this.constraint&&this.useLeft&&this.useTop){var b=this.options.parent==document.body?WindowUtilities.getPageSize().windowHeight:this.options.parent.getDimensions().height;var d=this.height+this.heightN+this.heightS;if(e<this.constraintPad.top){e=this.constraintPad.top}if(e+d>b-this.constraintPad.bottom){e=b-this.constraintPad.bottom-d}}return e},_updateWidthConstraint:function(b){if(this.constraint&&this.useLeft&&this.useTop){var d=this.options.parent==document.body?WindowUtilities.getPageSize().windowWidth:this.options.parent.getDimensions().width;var e=parseFloat(this.element.getStyle("left"));if(e+b+this.widthE+this.widthW>d-this.constraintPad.right){b=d-this.constraintPad.right-e-this.widthE-this.widthW}}return b},_updateHeightConstraint:function(d){if(this.constraint&&this.useLeft&&this.useTop){var b=this.options.parent==document.body?WindowUtilities.getPageSize().windowHeight:this.options.parent.getDimensions().height;var e=parseFloat(this.element.getStyle("top"));if(e+d+this.heightN+this.heightS>b-this.constraintPad.bottom){d=b-this.constraintPad.bottom-e-this.heightN-this.heightS}}return d},_createWindow:function(b){var h=this.options.className;var f=document.createElement("div");f.setAttribute("id",b);f.className="dialog";if(this.options.windowClassName){f.className+=" "+this.options.windowClassName}var g;if(this.options.url){g='<iframe frameborder="0" name="'+b+'_content"  id="'+b+'_content" src="'+this.options.url+'"> </iframe>'}else{g='<div id="'+b+'_content" class="'+h+'_content"> </div>'}var l=this.options.closable?"<div class='"+h+"_close' id='"+b+"_close' onclick='Windows.close(\""+b+"\", event)'> </div>":"";var n=this.options.minimizable?"<div class='"+h+"_minimize' id='"+b+"_minimize' onclick='Windows.minimize(\""+b+"\", event)'> </div>":"";var o=this.options.maximizable?"<div class='"+h+"_maximize' id='"+b+"_maximize' onclick='Windows.maximize(\""+b+"\", event)'> </div>":"";var e=this.options.resizable?"class='"+h+"_sizer' id='"+b+"_sizer'":"class='"+h+"_se'";var d="../themes/default/blank.gif";f.innerHTML=l+n+o+"      <a href='#' id='"+b+"_focus_anchor'><!-- --></a>      <table id='"+b+"_row1' class=\"top table_window\">        <tr>          <td class='"+h+"_nw'></td>          <td class='"+h+"_n'><div id='"+b+"_top' class='"+h+"_title title_window'>"+this.options.title+"</div></td>          <td class='"+h+"_ne'></td>        </tr>      </table>      <table id='"+b+"_row2' class=\"mid table_window\">        <tr>          <td class='"+h+"_w'></td>            <td id='"+b+"_table_content' class='"+h+"_content' valign='top'>"+g+"</td>          <td class='"+h+"_e'></td>        </tr>      </table>        <table id='"+b+"_row3' class=\"bot table_window\">        <tr>          <td class='"+h+"_sw'></td>            <td class='"+h+"_s'><div id='"+b+"_bottom' class='status_bar'><span style='float:left; width:1px; height:1px'></span></div></td>            <td "+e+"></td>        </tr>      </table>    ";Element.hide(f);this.options.parent.insertBefore(f,this.options.parent.firstChild);Event.observe($(b+"_content"),"load",this.options.onload);return f},changeClassName:function(b){var d=this.options.className;var e=this.getId();$A(["_close","_minimize","_maximize","_sizer","_content"]).each(function(f){this._toggleClassName($(e+f),d+f,b+f)}.bind(this));this._toggleClassName($(e+"_top"),d+"_title",b+"_title");$$("#"+e+" td").each(function(f){f.className=f.className.sub(d,b)});this.options.className=b},_toggleClassName:function(e,d,b){if(e){e.removeClassName(d);e.addClassName(b)}},setLocation:function(f,d){f=this._updateTopConstraint(f);d=this._updateLeftConstraint(d);var b=this.currentDrag||this.element;b.setStyle({top:f+"px"});b.setStyle({left:d+"px"});this.useLeft=true;this.useTop=true},getLocation:function(){var b={};if(this.useTop){b=Object.extend(b,{top:this.element.getStyle("top")})}else{b=Object.extend(b,{bottom:this.element.getStyle("bottom")})}if(this.useLeft){b=Object.extend(b,{left:this.element.getStyle("left")})}else{b=Object.extend(b,{right:this.element.getStyle("right")})}return b},getSize:function(){return{width:this.width,height:this.height}},setSize:function(f,d,b){f=parseFloat(f);d=parseFloat(d);if(!this.minimized&&f<this.options.minWidth){f=this.options.minWidth}if(!this.minimized&&d<this.options.minHeight){d=this.options.minHeight}if(this.options.maxHeight&&d>this.options.maxHeight){d=this.options.maxHeight}if(this.options.maxWidth&&f>this.options.maxWidth){f=this.options.maxWidth}if(this.useTop&&this.useLeft&&Window.hasEffectLib&&Effect.ResizeWindow&&b){new Effect.ResizeWindow(this,null,null,f,d,{duration:Window.resizeEffectDuration})}else{this.width=f;this.height=d;var h=this.currentDrag?this.currentDrag:this.element;h.setStyle({width:f+this.widthW+this.widthE+"px"});h.setStyle({height:d+this.heightN+this.heightS+"px"});if(!this.currentDrag||this.currentDrag==this.element){var g=$(this.element.id+"_content");g.setStyle({height:d+"px"});g.setStyle({width:f+"px"})}}},updateHeight:function(){this.setSize(this.width,this.content.scrollHeight,true)},updateWidth:function(){this.setSize(this.content.scrollWidth,this.height,true)},toFront:function(){if(this.element.style.zIndex<Windows.maxZIndex){this.setZIndex(Windows.maxZIndex+1)}if(this.iefix){this._fixIEOverlapping()}},getBounds:function(d){if(!this.width||!this.height||!this.visible){this.computeBounds()}var b=this.width;var e=this.height;if(!d){b+=this.widthW+this.widthE;e+=this.heightN+this.heightS}var f=Object.extend(this.getLocation(),{width:b+"px",height:e+"px"});return f},computeBounds:function(){if(!this.width||!this.height){var b=WindowUtilities._computeSize(this.content.innerHTML,this.content.id,this.width,this.height,0,this.options.className);if(this.height){this.width=b+5}else{this.height=b+5}}this.setSize(this.width,this.height);if(this.centered){this._center(this.centerTop,this.centerLeft)}},show:function(d){this.visible=true;if(d){if(typeof this.overlayOpacity=="undefined"){var b=this;setTimeout(function(){b.show(d)},10);return}Windows.addModalWindow(this);this.modal=true;this.setZIndex(Windows.maxZIndex+1);Windows.unsetOverflow(this)}else{if(!this.element.style.zIndex){this.setZIndex(Windows.maxZIndex+1)}}if(this.oldStyle){this.getContent().setStyle({overflow:this.oldStyle})}this.computeBounds();this._notify("onBeforeShow");if(this.options.showEffect!=Element.show&&this.options.showEffectOptions){this.options.showEffect(this.element,this.options.showEffectOptions)}else{this.options.showEffect(this.element)}this._checkIEOverlapping();WindowUtilities.focusedWindow=this;this._notify("onShow");$(this.element.id+"_focus_anchor").focus()},showCenter:function(b,e,d){this.centered=true;this.centerTop=e;this.centerLeft=d;this.show(b)},isVisible:function(){return this.visible},_center:function(e,d){var f=WindowUtilities.getWindowScroll(this.options.parent);var b=WindowUtilities.getPageSize(this.options.parent);if(typeof e=="undefined"){e=(b.windowHeight-(this.height+this.heightN+this.heightS))/2}e+=f.top;if(typeof d=="undefined"){d=(b.windowWidth-(this.width+this.widthW+this.widthE))/2}d+=f.left;this.setLocation(e,d);this.toFront()},_recenter:function(d){if(this.centered){var b=WindowUtilities.getPageSize(this.options.parent);var e=WindowUtilities.getWindowScroll(this.options.parent);if(this.pageSize&&this.pageSize.windowWidth==b.windowWidth&&this.pageSize.windowHeight==b.windowHeight&&this.windowScroll.left==e.left&&this.windowScroll.top==e.top){return}this.pageSize=b;this.windowScroll=e;if($("overlay_modal")){$("overlay_modal").setStyle({height:(b.pageHeight+"px")})}if(this.options.recenterAuto){this._center(this.centerTop,this.centerLeft)}}},hide:function(){this.visible=false;if(this.modal){Windows.removeModalWindow(this);Windows.resetOverflow()}this.oldStyle=this.getContent().getStyle("overflow")||"auto";this.getContent().setStyle({overflow:"hidden"});this.options.hideEffect(this.element,this.options.hideEffectOptions);if(this.iefix){this.iefix.hide()}if(!this.doNotNotifyHide){this._notify("onHide")}},close:function(){if(this.visible){if(this.options.closeCallback&&!this.options.closeCallback(this)){return}if(this.options.destroyOnClose){var b=this.destroy.bind(this);if(this.options.hideEffectOptions.afterFinish){var d=this.options.hideEffectOptions.afterFinish;this.options.hideEffectOptions.afterFinish=function(){d();b()}}else{this.options.hideEffectOptions.afterFinish=function(){b()}}}Windows.updateFocusedWindow();this.doNotNotifyHide=true;this.hide();this.doNotNotifyHide=false;this._notify("onClose")}},minimize:function(){if(this.resizing){return}var b=$(this.getId()+"_row2");if(!this.minimized){this.minimized=true;var f=b.getDimensions().height;this.r2Height=f;var e=this.element.getHeight()-f;if(this.useLeft&&this.useTop&&Window.hasEffectLib&&Effect.ResizeWindow){new Effect.ResizeWindow(this,null,null,null,this.height-f,{duration:Window.resizeEffectDuration})}else{this.height-=f;this.element.setStyle({height:e+"px"});b.hide()}if(!this.useTop){var d=parseFloat(this.element.getStyle("bottom"));this.element.setStyle({bottom:(d+f)+"px"})}}else{this.minimized=false;var f=this.r2Height;this.r2Height=null;if(this.useLeft&&this.useTop&&Window.hasEffectLib&&Effect.ResizeWindow){new Effect.ResizeWindow(this,null,null,null,this.height+f,{duration:Window.resizeEffectDuration})}else{var e=this.element.getHeight()+f;this.height+=f;this.element.setStyle({height:e+"px"});b.show()}if(!this.useTop){var d=parseFloat(this.element.getStyle("bottom"));this.element.setStyle({bottom:(d-f)+"px"})}this.toFront()}this._notify("onMinimize");this._saveCookie()},maximize:function(){if(this.isMinimized()||this.resizing){return}if(Prototype.Browser.IE&&this.heightN==0){this._getWindowBorderSize()}if(this.storedLocation!=null){this._restoreLocation();if(this.iefix){this.iefix.hide()}}else{this._storeLocation();Windows.unsetOverflow(this);var l=WindowUtilities.getWindowScroll(this.options.parent);var d=WindowUtilities.getPageSize(this.options.parent);var h=l.left;var g=l.top;if(this.options.parent!=document.body){l={top:0,left:0,bottom:0,right:0};var f=this.options.parent.getDimensions();d.windowWidth=f.width;d.windowHeight=f.height;g=0;h=0}if(this.constraint){d.windowWidth-=Math.max(0,this.constraintPad.left)+Math.max(0,this.constraintPad.right);d.windowHeight-=Math.max(0,this.constraintPad.top)+Math.max(0,this.constraintPad.bottom);h+=Math.max(0,this.constraintPad.left);g+=Math.max(0,this.constraintPad.top)}var e=d.windowWidth-this.widthW-this.widthE;var b=d.windowHeight-this.heightN-this.heightS;if(this.useLeft&&this.useTop&&Window.hasEffectLib&&Effect.ResizeWindow){new Effect.ResizeWindow(this,g,h,e,b,{duration:Window.resizeEffectDuration})}else{this.setSize(e,b);this.element.setStyle(this.useLeft?{left:h}:{right:h});this.element.setStyle(this.useTop?{top:g}:{bottom:g})}this.toFront();if(this.iefix){this._fixIEOverlapping()}}this._notify("onMaximize");this._saveCookie()},isMinimized:function(){return this.minimized},isMaximized:function(){return(this.storedLocation!=null)},setOpacity:function(b){if(Element.setOpacity){Element.setOpacity(this.element,b)}},setZIndex:function(b){this.element.setStyle({zIndex:b});Windows.updateZindex(b,this)},setTitle:function(b){if(!b||b==""){b="&nbsp;"}Element.update(this.element.id+"_top",b)},getTitle:function(){return $(this.element.id+"_top").innerHTML},setStatusBar:function(d){var b=$(this.getId()+"_bottom");if(typeof(d)=="object"){if(this.bottombar.firstChild){this.bottombar.replaceChild(d,this.bottombar.firstChild)}else{this.bottombar.appendChild(d)}}else{this.bottombar.innerHTML=d}},_checkIEOverlapping:function(){if(!this.iefix&&(navigator.appVersion.indexOf("MSIE")>0)&&(navigator.userAgent.indexOf("Opera")<0)&&(this.element.getStyle("position")=="absolute")){new Insertion.After(this.element.id,'<iframe id="'+this.element.id+'_iefix" style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" src="javascript:false;" frameborder="0" scrolling="no"></iframe>');this.iefix=$(this.element.id+"_iefix")}if(this.iefix){setTimeout(this._fixIEOverlapping.bind(this),50)}},_fixIEOverlapping:function(){Position.clone(this.element,this.iefix);this.iefix.style.zIndex=this.element.style.zIndex-1;this.iefix.show()},_keyUp:function(b){if(27==b.keyCode&&this.options.closeOnEsc){this.close()}},_getWindowBorderSize:function(d){var e=this._createHiddenDiv(this.options.className+"_n");this.heightN=Element.getDimensions(e).height;e.parentNode.removeChild(e);var e=this._createHiddenDiv(this.options.className+"_s");this.heightS=Element.getDimensions(e).height;e.parentNode.removeChild(e);var e=this._createHiddenDiv(this.options.className+"_e");this.widthE=Element.getDimensions(e).width;e.parentNode.removeChild(e);var e=this._createHiddenDiv(this.options.className+"_w");this.widthW=Element.getDimensions(e).width;e.parentNode.removeChild(e);var e=document.createElement("div");e.className="overlay_"+this.options.className;document.body.appendChild(e);var b=this;setTimeout(function(){b.overlayOpacity=($(e).getStyle("opacity"));e.parentNode.removeChild(e)},10);if(Prototype.Browser.IE){this.heightS=$(this.getId()+"_row3").getDimensions().height;this.heightN=$(this.getId()+"_row1").getDimensions().height}if(Prototype.Browser.WebKit&&Prototype.Browser.WebKitVersion<420){this.setSize(this.width,this.height)}if(this.doMaximize){this.maximize()}if(this.doMinimize){this.minimize()}},_createHiddenDiv:function(d){var b=document.body;var e=document.createElement("div");e.setAttribute("id",this.element.id+"_tmp");e.className=d;e.style.display="none";e.innerHTML="";b.insertBefore(e,b.firstChild);return e},_storeLocation:function(){if(this.storedLocation==null){this.storedLocation={useTop:this.useTop,useLeft:this.useLeft,top:this.element.getStyle("top"),bottom:this.element.getStyle("bottom"),left:this.element.getStyle("left"),right:this.element.getStyle("right"),width:this.width,height:this.height}}},_restoreLocation:function(){if(this.storedLocation!=null){this.useLeft=this.storedLocation.useLeft;this.useTop=this.storedLocation.useTop;if(this.useLeft&&this.useTop&&Window.hasEffectLib&&Effect.ResizeWindow){new Effect.ResizeWindow(this,this.storedLocation.top,this.storedLocation.left,this.storedLocation.width,this.storedLocation.height,{duration:Window.resizeEffectDuration})}else{this.element.setStyle(this.useLeft?{left:this.storedLocation.left}:{right:this.storedLocation.right});this.element.setStyle(this.useTop?{top:this.storedLocation.top}:{bottom:this.storedLocation.bottom});this.setSize(this.storedLocation.width,this.storedLocation.height)}Windows.resetOverflow();this._removeStoreLocation()}},_removeStoreLocation:function(){this.storedLocation=null},_saveCookie:function(){if(this.cookie){var b="";if(this.useLeft){b+="l:"+(this.storedLocation?this.storedLocation.left:this.element.getStyle("left"))}else{b+="r:"+(this.storedLocation?this.storedLocation.right:this.element.getStyle("right"))}if(this.useTop){b+=",t:"+(this.storedLocation?this.storedLocation.top:this.element.getStyle("top"))}else{b+=",b:"+(this.storedLocation?this.storedLocation.bottom:this.element.getStyle("bottom"))}b+=","+(this.storedLocation?this.storedLocation.width:this.width);b+=","+(this.storedLocation?this.storedLocation.height:this.height);b+=","+this.isMinimized();b+=","+this.isMaximized();WindowUtilities.setCookie(b,this.cookie)}},_createWiredElement:function(){if(!this.wiredElement){if(Prototype.Browser.IE){this._getWindowBorderSize()}var d=document.createElement("div");d.className="wired_frame "+this.options.className+"_wired_frame";d.style.position="absolute";this.options.parent.insertBefore(d,this.options.parent.firstChild);this.wiredElement=$(d)}if(this.useLeft){this.wiredElement.setStyle({left:this.element.getStyle("left")})}else{this.wiredElement.setStyle({right:this.element.getStyle("right")})}if(this.useTop){this.wiredElement.setStyle({top:this.element.getStyle("top")})}else{this.wiredElement.setStyle({bottom:this.element.getStyle("bottom")})}var b=this.element.getDimensions();this.wiredElement.setStyle({width:b.width+"px",height:b.height+"px"});this.wiredElement.setStyle({zIndex:Windows.maxZIndex+30});return this.wiredElement},_hideWiredElement:function(){if(!this.wiredElement||!this.currentDrag){return}if(this.currentDrag==this.element){this.currentDrag=null}else{if(this.useLeft){this.element.setStyle({left:this.currentDrag.getStyle("left")})}else{this.element.setStyle({right:this.currentDrag.getStyle("right")})}if(this.useTop){this.element.setStyle({top:this.currentDrag.getStyle("top")})}else{this.element.setStyle({bottom:this.currentDrag.getStyle("bottom")})}this.currentDrag.hide();this.currentDrag=null;if(this.doResize){this.setSize(this.width,this.height)}}},_notify:function(b){if(this.options[b]){this.options[b](this)}else{Windows.notify(b,this)}}};var Windows={windows:[],modalWindows:[],observers:[],focusedWindow:null,maxZIndex:0,overlayShowEffectOptions:{duration:0.5},overlayHideEffectOptions:{duration:0.5},addObserver:function(b){this.removeObserver(b);this.observers.push(b)},removeObserver:function(b){this.observers=this.observers.reject(function(d){return d==b})},notify:function(b,d){this.observers.each(function(e){if(e[b]){e[b](b,d)}})},getWindow:function(b){return this.windows.detect(function(e){return e.getId()==b})},getFocusedWindow:function(){return this.focusedWindow},updateFocusedWindow:function(){this.focusedWindow=this.windows.length>=2?this.windows[this.windows.length-2]:null},register:function(b){this.windows.push(b)},addModalWindow:function(b){if(this.modalWindows.length==0){WindowUtilities.disableScreen(b.options.className,"overlay_modal",b.overlayOpacity,b.getId(),b.options.parent)}else{if(Window.keepMultiModalWindow){$("overlay_modal").style.zIndex=Windows.maxZIndex+1;Windows.maxZIndex+=1;WindowUtilities._hideSelect(this.modalWindows.last().getId())}else{this.modalWindows.last().element.hide()}WindowUtilities._showSelect(b.getId())}this.modalWindows.push(b)},removeModalWindow:function(b){this.modalWindows.pop();if(this.modalWindows.length==0){WindowUtilities.enableScreen()}else{if(Window.keepMultiModalWindow){this.modalWindows.last().toFront();WindowUtilities._showSelect(this.modalWindows.last().getId())}else{this.modalWindows.last().element.show()}}},register:function(b){this.windows.push(b)},unregister:function(b){this.windows=this.windows.reject(function(e){return e==b})},closeAll:function(){this.windows.each(function(b){Windows.close(b.getId())})},closeAllModalWindows:function(){WindowUtilities.enableScreen();this.modalWindows.each(function(b){if(b){b.close()}})},minimize:function(e,b){var d=this.getWindow(e);if(d&&d.visible){d.minimize()}Event.stop(b)},maximize:function(e,b){var d=this.getWindow(e);if(d&&d.visible){d.maximize()}Event.stop(b)},close:function(e,b){var d=this.getWindow(e);if(d){d.close()}if(b){Event.stop(b)}},blur:function(d){var b=this.getWindow(d);if(!b){return}if(b.options.blurClassName){b.changeClassName(b.options.blurClassName)}if(this.focusedWindow==b){this.focusedWindow=null}b._notify("onBlur")},focus:function(d){var b=this.getWindow(d);if(!b){return}if(this.focusedWindow){this.blur(this.focusedWindow.getId())}if(b.options.focusClassName){b.changeClassName(b.options.focusClassName)}this.focusedWindow=b;b._notify("onFocus")},unsetOverflow:function(b){this.windows.each(function(e){e.oldOverflow=e.getContent().getStyle("overflow")||"auto";e.getContent().setStyle({overflow:"hidden"})});if(b&&b.oldOverflow){b.getContent().setStyle({overflow:b.oldOverflow})}},resetOverflow:function(){this.windows.each(function(b){if(b.oldOverflow){b.getContent().setStyle({overflow:b.oldOverflow})}})},updateZindex:function(b,d){if(b>this.maxZIndex){this.maxZIndex=b;if(this.focusedWindow){this.blur(this.focusedWindow.getId())}}this.focusedWindow=d;if(this.focusedWindow){this.focus(this.focusedWindow.getId())}}};var Dialog={dialogId:null,onCompleteFunc:null,callFunc:null,parameters:null,confirm:function(f,e){if(f&&typeof f!="string"){Dialog._runAjaxRequest(f,e,Dialog.confirm);return}f=f||"";e=e||{};var h=e.okLabel?e.okLabel:"Ok";var b=e.cancelLabel?e.cancelLabel:"Cancel";e=Object.extend(e,e.windowParameters||{});e.windowParameters=e.windowParameters||{};e.className=e.className||"alert";var d="class ='"+(e.buttonClass?e.buttonClass+" ":"")+" ok_button'";var g="class ='"+(e.buttonClass?e.buttonClass+" ":"")+" cancel_button'";var f="      <div class='"+e.className+"_message'>"+f+"</div>        <div class='"+e.className+"_buttons'>          <button type='button' title='"+h+"' onclick='Dialog.okCallback()' "+d+"><span><span><span>"+h+"</span></span></span></button>          <button type='button' title='"+b+"' onclick='Dialog.cancelCallback()' "+g+"><span><span><span>"+b+"</span></span></span></button>        </div>    ";return this._openDialog(f,e)},alert:function(e,d){if(e&&typeof e!="string"){Dialog._runAjaxRequest(e,d,Dialog.alert);return}e=e||"";d=d||{};var f=d.okLabel?d.okLabel:"Ok";d=Object.extend(d,d.windowParameters||{});d.windowParameters=d.windowParameters||{};d.className=d.className||"alert";var b="class ='"+(d.buttonClass?d.buttonClass+" ":"")+" ok_button'";var e="      <div class='"+d.className+"_message'>"+e+"</div>        <div class='"+d.className+"_buttons'>          <button type='button' title='"+f+"' onclick='Dialog.okCallback()' "+b+"><span><span><span>"+f+"</span></span></span></button>        </div>";return this._openDialog(e,d)},info:function(d,b){if(d&&typeof d!="string"){Dialog._runAjaxRequest(d,b,Dialog.info);return}d=d||"";b=b||{};b=Object.extend(b,b.windowParameters||{});b.windowParameters=b.windowParameters||{};b.className=b.className||"alert";var d="<div id='modal_dialog_message' class='"+b.className+"_message'>"+d+"</div>";if(b.showProgress){d+="<div id='modal_dialog_progress' class='"+b.className+"_progress'>  </div>"}b.ok=null;b.cancel=null;return this._openDialog(d,b)},setInfoMessage:function(b){$("modal_dialog_message").update(b)},closeInfo:function(){Windows.close(this.dialogId)},_openDialog:function(g,f){var e=f.className;if(!f.height&&!f.width){f.width=WindowUtilities.getPageSize(f.options.parent||document.body).pageWidth/2}if(f.id){this.dialogId=f.id}else{var d=new Date();this.dialogId="modal_dialog_"+d.getTime();f.id=this.dialogId}if(!f.height||!f.width){var b=WindowUtilities._computeSize(g,this.dialogId,f.width,f.height,5,e);if(f.height){f.width=b+5}else{f.height=b+5}}f.effectOptions=f.effectOptions;f.resizable=f.resizable||false;f.minimizable=f.minimizable||false;f.maximizable=f.maximizable||false;f.draggable=f.draggable||false;f.closable=f.closable||false;var h=new Window(f);h.getContent().innerHTML=g;h.showCenter(true,f.top,f.left);h.setDestroyOnClose();h.cancelCallback=f.onCancel||f.cancel;h.okCallback=f.onOk||f.ok;return h},_getAjaxContent:function(b){Dialog.callFunc(b.responseText,Dialog.parameters)},_runAjaxRequest:function(e,d,b){if(e.options==null){e.options={}}Dialog.onCompleteFunc=e.options.onComplete;Dialog.parameters=d;Dialog.callFunc=b;e.options.onComplete=Dialog._getAjaxContent;new Ajax.Request(e.url,e.options)},okCallback:function(){var b=Windows.focusedWindow;if(!b.okCallback||b.okCallback(b)){$$("#"+b.getId()+" input").each(function(d){d.onclick=null});b.close()}},cancelCallback:function(){var b=Windows.focusedWindow;$$("#"+b.getId()+" input").each(function(d){d.onclick=null});b.close();if(b.cancelCallback){b.cancelCallback(b)}}};if(Prototype.Browser.WebKit){var array=navigator.userAgent.match(new RegExp(/AppleWebKit\/([\d\.\+]*)/));Prototype.Browser.WebKitVersion=parseFloat(array[1])}var WindowUtilities={getWindowScroll:function(parent){var T,L,W,H;parent=parent||document.body;if(parent!=document.body){T=parent.scrollTop;L=parent.scrollLeft;W=parent.scrollWidth;H=parent.scrollHeight}else{var w=window;with(w.document){if(w.document.documentElement&&documentElement.scrollTop){T=documentElement.scrollTop;L=documentElement.scrollLeft}else{if(w.document.body){T=body.scrollTop;L=body.scrollLeft}}if(w.innerWidth){W=w.innerWidth;H=w.innerHeight}else{if(w.document.documentElement&&documentElement.clientWidth){W=documentElement.clientWidth;H=documentElement.clientHeight}else{W=body.offsetWidth;H=body.offsetHeight}}}}return{top:T,left:L,width:W,height:H}},getPageSize:function(f){f=f||document.body;var e,l;var g,d;if(f!=document.body){e=f.getWidth();l=f.getHeight();d=f.scrollWidth;g=f.scrollHeight}else{var h,b;if(window.innerHeight&&window.scrollMaxY){h=document.body.scrollWidth;b=window.innerHeight+window.scrollMaxY}else{if(document.body.scrollHeight>document.body.offsetHeight){h=document.body.scrollWidth;b=document.body.scrollHeight}else{h=document.body.offsetWidth;b=document.body.offsetHeight}}if(self.innerHeight){e=document.documentElement.clientWidth;l=self.innerHeight}else{if(document.documentElement&&document.documentElement.clientHeight){e=document.documentElement.clientWidth;l=document.documentElement.clientHeight}else{if(document.body){e=document.body.clientWidth;l=document.body.clientHeight}}}if(b<l){g=l}else{g=b}if(h<e){d=e}else{d=h}}return{pageWidth:d,pageHeight:g,windowWidth:e,windowHeight:l}},disableScreen:function(e,b,f,g,d){WindowUtilities.initLightbox(b,e,function(){this._disableScreen(e,b,f,g)}.bind(this),d||document.body)},_disableScreen:function(e,d,g,h){var f=$(d);var b=WindowUtilities.getPageSize(f.parentNode);if(h&&Prototype.Browser.IE){WindowUtilities._hideSelect();WindowUtilities._showSelect(h)}f.style.height=(b.pageHeight+"px");f.style.display="none";if(d=="overlay_modal"&&Window.hasEffectLib&&Windows.overlayShowEffectOptions){f.overlayOpacity=g;new Effect.Appear(f,Object.extend({from:0,to:g},Windows.overlayShowEffectOptions))}else{f.style.display="block"}},enableScreen:function(d){d=d||"overlay_modal";var b=$(d);if(b){if(d=="overlay_modal"&&Window.hasEffectLib&&Windows.overlayHideEffectOptions){new Effect.Fade(b,Object.extend({from:b.overlayOpacity,to:0},Windows.overlayHideEffectOptions))}else{b.style.display="none";b.parentNode.removeChild(b)}if(d!="__invisible__"){WindowUtilities._showSelect()}}},_hideSelect:function(b){if(Prototype.Browser.IE){b=b==null?"":"#"+b+" ";$$(b+"select").each(function(d){if(!WindowUtilities.isDefined(d.oldVisibility)){d.oldVisibility=d.style.visibility?d.style.visibility:"visible";d.style.visibility="hidden"}})}},_showSelect:function(b){if(Prototype.Browser.IE){b=b==null?"":"#"+b+" ";$$(b+"select").each(function(d){if(WindowUtilities.isDefined(d.oldVisibility)){try{d.style.visibility=d.oldVisibility}catch(f){d.style.visibility="visible"}d.oldVisibility=null}else{if(d.style.visibility){d.style.visibility="visible"}}})}},isDefined:function(b){return typeof(b)!="undefined"&&b!=null},initLightbox:function(g,e,b,d){if($(g)){Element.setStyle(g,{zIndex:Windows.maxZIndex+1});Windows.maxZIndex++;b()}else{var f=document.createElement("div");f.setAttribute("id",g);f.className="overlay_"+e;f.style.display="none";f.style.position="absolute";f.style.top="0";f.style.left="0";f.style.zIndex=Windows.maxZIndex+1;Windows.maxZIndex++;f.style.width="100%";d.insertBefore(f,d.firstChild);if(Prototype.Browser.WebKit&&g=="overlay_modal"){setTimeout(function(){b()},10)}else{b()}}},setCookie:function(d,b){document.cookie=b[0]+"="+escape(d)+((b[1])?"; expires="+b[1].toUTCString():"")+((b[2])?"; path="+b[2]:"")+((b[3])?"; domain="+b[3]:"")+((b[4])?"; secure":"")},getCookie:function(e){var d=document.cookie;var g=e+"=";var f=d.indexOf("; "+g);if(f==-1){f=d.indexOf(g);if(f!=0){return null}}else{f+=2}var b=document.cookie.indexOf(";",f);if(b==-1){b=d.length}return unescape(d.substring(f+g.length,b))},_computeSize:function(g,b,d,l,f,h){var o=document.body;var e=document.createElement("div");e.setAttribute("id",b);e.className=h+"_content";if(l){e.style.height=l+"px"}else{e.style.width=d+"px"}e.style.position="absolute";e.style.top="0";e.style.left="0";e.style.display="none";e.innerHTML=g;o.insertBefore(e,o.firstChild);var n;if(l){n=$(e).getDimensions().width+f}else{n=$(e).getDimensions().height+f}o.removeChild(e);return n}};var Builder={NODEMAP:{AREA:"map",CAPTION:"table",COL:"table",COLGROUP:"table",LEGEND:"fieldset",OPTGROUP:"select",OPTION:"select",PARAM:"object",TBODY:"table",TD:"table",TFOOT:"table",TH:"table",THEAD:"table",TR:"table"},node:function(b){b=b.toUpperCase();var l=this.NODEMAP[b]||"div";var d=document.createElement(l);try{d.innerHTML="<"+b+"></"+b+">"}catch(h){}var g=d.firstChild||null;if(g&&(g.tagName.toUpperCase()!=b)){g=g.getElementsByTagName(b)[0]}if(!g){g=document.createElement(b)}if(!g){return}if(arguments[1]){if(this._isStringOrNumber(arguments[1])||(arguments[1] instanceof Array)||arguments[1].tagName){this._children(g,arguments[1])}else{var f=this._attributes(arguments[1]);if(f.length){try{d.innerHTML="<"+b+" "+f+"></"+b+">"}catch(h){}g=d.firstChild||null;if(!g){g=document.createElement(b);for(attr in arguments[1]){g[attr=="class"?"className":attr]=arguments[1][attr]}}if(g.tagName.toUpperCase()!=b){g=d.getElementsByTagName(b)[0]}}}}if(arguments[2]){this._children(g,arguments[2])}return $(g)},_text:function(b){return document.createTextNode(b)},ATTR_MAP:{className:"class",htmlFor:"for"},_attributes:function(b){var d=[];for(attribute in b){d.push((attribute in this.ATTR_MAP?this.ATTR_MAP[attribute]:attribute)+'="'+b[attribute].toString().escapeHTML().gsub(/"/,"&quot;")+'"')}return d.join(" ")},_children:function(d,b){if(b.tagName){d.appendChild(b);return}if(typeof b=="object"){b.flatten().each(function(f){if(typeof f=="object"){d.appendChild(f)}else{if(Builder._isStringOrNumber(f)){d.appendChild(Builder._text(f))}}})}else{if(Builder._isStringOrNumber(b)){d.appendChild(Builder._text(b))}}},_isStringOrNumber:function(b){return(typeof b=="string"||typeof b=="number")},build:function(d){var b=this.node("div");$(b).update(d.strip());return b.down()},dump:function(d){if(typeof d!="object"&&typeof d!="function"){d=window}var b=("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/);b.each(function(e){d[e]=function(){return Builder.node.apply(Builder,[e].concat($A(arguments)))}})}};String.prototype.parseColor=function(){var b="#";if(this.slice(0,4)=="rgb("){var e=this.slice(4,this.length-1).split(",");var d=0;do{b+=parseInt(e[d]).toColorPart()}while(++d<3)}else{if(this.slice(0,1)=="#"){if(this.length==4){for(var d=1;d<4;d++){b+=(this.charAt(d)+this.charAt(d)).toLowerCase()}}if(this.length==7){b=this.toLowerCase()}}}return(b.length==7?b:(arguments[0]||this))};Element.collectTextNodes=function(b){return $A($(b).childNodes).collect(function(d){return(d.nodeType==3?d.nodeValue:(d.hasChildNodes()?Element.collectTextNodes(d):""))}).flatten().join("")};Element.collectTextNodesIgnoreClass=function(b,d){return $A($(b).childNodes).collect(function(e){return(e.nodeType==3?e.nodeValue:((e.hasChildNodes()&&!Element.hasClassName(e,d))?Element.collectTextNodesIgnoreClass(e,d):""))}).flatten().join("")};Element.setContentZoom=function(b,d){b=$(b);b.setStyle({fontSize:(d/100)+"em"});if(Prototype.Browser.WebKit){window.scrollBy(0,0)}return b};Element.getInlineOpacity=function(b){return $(b).style.opacity||""};Element.forceRerendering=function(b){try{b=$(b);var f=document.createTextNode(" ");b.appendChild(f);b.removeChild(f)}catch(d){}};var Effect={_elementDoesNotExistError:{name:"ElementDoesNotExistError",message:"The specified DOM element does not exist, but is required for this effect to operate"},Transitions:{linear:Prototype.K,sinoidal:function(b){return(-Math.cos(b*Math.PI)/2)+0.5},reverse:function(b){return 1-b},flicker:function(b){var b=((-Math.cos(b*Math.PI)/4)+0.75)+Math.random()/4;return b>1?1:b},wobble:function(b){return(-Math.cos(b*Math.PI*(9*b))/2)+0.5},pulse:function(d,b){return(-Math.cos((d*((b||5)-0.5)*2)*Math.PI)/2)+0.5},spring:function(b){return 1-(Math.cos(b*4.5*Math.PI)*Math.exp(-b*6))},none:function(b){return 0},full:function(b){return 1}},DefaultOptions:{duration:1,fps:100,sync:false,from:0,to:1,delay:0,queue:"parallel"},tagifyText:function(b){var d="position:relative";if(Prototype.Browser.IE){d+=";zoom:1"}b=$(b);$A(b.childNodes).each(function(e){if(e.nodeType==3){e.nodeValue.toArray().each(function(f){b.insertBefore(new Element("span",{style:d}).update(f==" "?String.fromCharCode(160):f),e)});Element.remove(e)}})},multiple:function(d,e){var g;if(((typeof d=="object")||Object.isFunction(d))&&(d.length)){g=d}else{g=$(d).childNodes}var b=Object.extend({speed:0.1,delay:0},arguments[2]||{});var f=b.delay;$A(g).each(function(l,h){new e(l,Object.extend(b,{delay:h*b.speed+f}))})},PAIRS:{slide:["SlideDown","SlideUp"],blind:["BlindDown","BlindUp"],appear:["Appear","Fade"]},toggle:function(d,e){d=$(d);e=(e||"appear").toLowerCase();var b=Object.extend({queue:{position:"end",scope:(d.id||"global"),limit:1}},arguments[2]||{});Effect[d.visible()?Effect.PAIRS[e][1]:Effect.PAIRS[e][0]](d,b)}};Effect.DefaultOptions.transition=Effect.Transitions.sinoidal;Effect.ScopedQueue=Class.create(Enumerable,{initialize:function(){this.effects=[];this.interval=null},_each:function(b){this.effects._each(b)},add:function(d){var e=new Date().getTime();var b=Object.isString(d.options.queue)?d.options.queue:d.options.queue.position;switch(b){case"front":this.effects.findAll(function(f){return f.state=="idle"}).each(function(f){f.startOn+=d.finishOn;f.finishOn+=d.finishOn});break;case"with-last":e=this.effects.pluck("startOn").max()||e;break;case"end":e=this.effects.pluck("finishOn").max()||e;break}d.startOn+=e;d.finishOn+=e;if(!d.options.queue.limit||(this.effects.length<d.options.queue.limit)){this.effects.push(d)}if(!this.interval){this.interval=setInterval(this.loop.bind(this),15)}},remove:function(b){this.effects=this.effects.reject(function(d){return d==b});if(this.effects.length==0){clearInterval(this.interval);this.interval=null}},loop:function(){var e=new Date().getTime();for(var d=0,b=this.effects.length;d<b;d++){this.effects[d]&&this.effects[d].loop(e)}}});Effect.Queues={instances:$H(),get:function(b){if(!Object.isString(b)){return b}return this.instances.get(b)||this.instances.set(b,new Effect.ScopedQueue())}};Effect.Queue=Effect.Queues.get("global");Effect.Base=Class.create({position:null,start:function(b){function d(f,e){return((f[e+"Internal"]?"this.options."+e+"Internal(this);":"")+(f[e]?"this.options."+e+"(this);":""))}if(b&&b.transition===false){b.transition=Effect.Transitions.linear}this.options=Object.extend(Object.extend({},Effect.DefaultOptions),b||{});this.currentFrame=0;this.state="idle";this.startOn=this.options.delay*1000;this.finishOn=this.startOn+(this.options.duration*1000);this.fromToDelta=this.options.to-this.options.from;this.totalTime=this.finishOn-this.startOn;this.totalFrames=this.options.fps*this.options.duration;this.render=(function(){function e(g,f){if(g.options[f+"Internal"]){g.options[f+"Internal"](g)}if(g.options[f]){g.options[f](g)}}return function(f){if(this.state==="idle"){this.state="running";e(this,"beforeSetup");if(this.setup){this.setup()}e(this,"afterSetup")}if(this.state==="running"){f=(this.options.transition(f)*this.fromToDelta)+this.options.from;this.position=f;e(this,"beforeUpdate");if(this.update){this.update(f)}e(this,"afterUpdate")}}})();this.event("beforeStart");if(!this.options.sync){Effect.Queues.get(Object.isString(this.options.queue)?"global":this.options.queue.scope).add(this)}},loop:function(e){if(e>=this.startOn){if(e>=this.finishOn){this.render(1);this.cancel();this.event("beforeFinish");if(this.finish){this.finish()}this.event("afterFinish");return}var d=(e-this.startOn)/this.totalTime,b=(d*this.totalFrames).round();if(b>this.currentFrame){this.render(d);this.currentFrame=b}}},cancel:function(){if(!this.options.sync){Effect.Queues.get(Object.isString(this.options.queue)?"global":this.options.queue.scope).remove(this)}this.state="finished"},event:function(b){if(this.options[b+"Internal"]){this.options[b+"Internal"](this)}if(this.options[b]){this.options[b](this)}},inspect:function(){var b=$H();for(property in this){if(!Object.isFunction(this[property])){b.set(property,this[property])}}return"#<Effect:"+b.inspect()+",options:"+$H(this.options).inspect()+">"}});Effect.Parallel=Class.create(Effect.Base,{initialize:function(b){this.effects=b||[];this.start(arguments[1])},update:function(b){this.effects.invoke("render",b)},finish:function(b){this.effects.each(function(d){d.render(1);d.cancel();d.event("beforeFinish");if(d.finish){d.finish(b)}d.event("afterFinish")})}});Effect.Tween=Class.create(Effect.Base,{initialize:function(e,h,g){e=Object.isString(e)?$(e):e;var d=$A(arguments),f=d.last(),b=d.length==5?d[3]:null;this.method=Object.isFunction(f)?f.bind(e):Object.isFunction(e[f])?e[f].bind(e):function(l){e[f]=l};this.start(Object.extend({from:h,to:g},b||{}))},update:function(b){this.method(b)}});Effect.Event=Class.create(Effect.Base,{initialize:function(){this.start(Object.extend({duration:0},arguments[0]||{}))},update:Prototype.emptyFunction});Effect.Opacity=Class.create(Effect.Base,{initialize:function(d){this.element=$(d);if(!this.element){throw (Effect._elementDoesNotExistError)}if(Prototype.Browser.IE&&(!this.element.currentStyle.hasLayout)){this.element.setStyle({zoom:1})}var b=Object.extend({from:this.element.getOpacity()||0,to:1},arguments[1]||{});this.start(b)},update:function(b){this.element.setOpacity(b)}});Effect.Move=Class.create(Effect.Base,{initialize:function(d){this.element=$(d);if(!this.element){throw (Effect._elementDoesNotExistError)}var b=Object.extend({x:0,y:0,mode:"relative"},arguments[1]||{});this.start(b)},setup:function(){this.element.makePositioned();this.originalLeft=parseFloat(this.element.getStyle("left")||"0");this.originalTop=parseFloat(this.element.getStyle("top")||"0");if(this.options.mode=="absolute"){this.options.x=this.options.x-this.originalLeft;this.options.y=this.options.y-this.originalTop}},update:function(b){this.element.setStyle({left:(this.options.x*b+this.originalLeft).round()+"px",top:(this.options.y*b+this.originalTop).round()+"px"})}});Effect.MoveBy=function(d,b,e){return new Effect.Move(d,Object.extend({x:e,y:b},arguments[3]||{}))};Effect.Scale=Class.create(Effect.Base,{initialize:function(d,e){this.element=$(d);if(!this.element){throw (Effect._elementDoesNotExistError)}var b=Object.extend({scaleX:true,scaleY:true,scaleContent:true,scaleFromCenter:false,scaleMode:"box",scaleFrom:100,scaleTo:e},arguments[2]||{});this.start(b)},setup:function(){this.restoreAfterFinish=this.options.restoreAfterFinish||false;this.elementPositioning=this.element.getStyle("position");this.originalStyle={};["top","left","width","height","fontSize"].each(function(d){this.originalStyle[d]=this.element.style[d]}.bind(this));this.originalTop=this.element.offsetTop;this.originalLeft=this.element.offsetLeft;var b=this.element.getStyle("font-size")||"100%";["em","px","%","pt"].each(function(d){if(b.indexOf(d)>0){this.fontSize=parseFloat(b);this.fontSizeType=d}}.bind(this));this.factor=(this.options.scaleTo-this.options.scaleFrom)/100;this.dims=null;if(this.options.scaleMode=="box"){this.dims=[this.element.offsetHeight,this.element.offsetWidth]}if(/^content/.test(this.options.scaleMode)){this.dims=[this.element.scrollHeight,this.element.scrollWidth]}if(!this.dims){this.dims=[this.options.scaleMode.originalHeight,this.options.scaleMode.originalWidth]}},update:function(b){var d=(this.options.scaleFrom/100)+(this.factor*b);if(this.options.scaleContent&&this.fontSize){this.element.setStyle({fontSize:this.fontSize*d+this.fontSizeType})}this.setDimensions(this.dims[0]*d,this.dims[1]*d)},finish:function(b){if(this.restoreAfterFinish){this.element.setStyle(this.originalStyle)}},setDimensions:function(b,g){var h={};if(this.options.scaleX){h.width=g.round()+"px"}if(this.options.scaleY){h.height=b.round()+"px"}if(this.options.scaleFromCenter){var f=(b-this.dims[0])/2;var e=(g-this.dims[1])/2;if(this.elementPositioning=="absolute"){if(this.options.scaleY){h.top=this.originalTop-f+"px"}if(this.options.scaleX){h.left=this.originalLeft-e+"px"}}else{if(this.options.scaleY){h.top=-f+"px"}if(this.options.scaleX){h.left=-e+"px"}}}this.element.setStyle(h)}});Effect.Highlight=Class.create(Effect.Base,{initialize:function(d){this.element=$(d);if(!this.element){throw (Effect._elementDoesNotExistError)}var b=Object.extend({startcolor:"#ffff99"},arguments[1]||{});this.start(b)},setup:function(){if(this.element.getStyle("display")=="none"){this.cancel();return}this.oldStyle={};if(!this.options.keepBackgroundImage){this.oldStyle.backgroundImage=this.element.getStyle("background-image");this.element.setStyle({backgroundImage:"none"})}if(!this.options.endcolor){this.options.endcolor=this.element.getStyle("background-color").parseColor("#ffffff")}if(!this.options.restorecolor){this.options.restorecolor=this.element.getStyle("background-color")}this._base=$R(0,2).map(function(b){return parseInt(this.options.startcolor.slice(b*2+1,b*2+3),16)}.bind(this));this._delta=$R(0,2).map(function(b){return parseInt(this.options.endcolor.slice(b*2+1,b*2+3),16)-this._base[b]}.bind(this))},update:function(b){this.element.setStyle({backgroundColor:$R(0,2).inject("#",function(d,e,f){return d+((this._base[f]+(this._delta[f]*b)).round().toColorPart())}.bind(this))})},finish:function(){this.element.setStyle(Object.extend(this.oldStyle,{backgroundColor:this.options.restorecolor}))}});Effect.ScrollTo=function(e){var d=arguments[1]||{},b=document.viewport.getScrollOffsets(),f=$(e).cumulativeOffset();if(d.offset){f[1]+=d.offset}return new Effect.Tween(null,b.top,f[1],d,function(g){scrollTo(b.left,g.round())})};Effect.Fade=function(e){e=$(e);var b=e.getInlineOpacity();var d=Object.extend({from:e.getOpacity()||1,to:0,afterFinishInternal:function(f){if(f.options.to!=0){return}f.element.hide().setStyle({opacity:b})}},arguments[1]||{});return new Effect.Opacity(e,d)};Effect.Appear=function(d){d=$(d);var b=Object.extend({from:(d.getStyle("display")=="none"?0:d.getOpacity()||0),to:1,afterFinishInternal:function(e){e.element.forceRerendering()},beforeSetup:function(e){e.element.setOpacity(e.options.from).show()}},arguments[1]||{});return new Effect.Opacity(d,b)};Effect.Puff=function(d){d=$(d);var b={opacity:d.getInlineOpacity(),position:d.getStyle("position"),top:d.style.top,left:d.style.left,width:d.style.width,height:d.style.height};return new Effect.Parallel([new Effect.Scale(d,200,{sync:true,scaleFromCenter:true,scaleContent:true,restoreAfterFinish:true}),new Effect.Opacity(d,{sync:true,to:0})],Object.extend({duration:1,beforeSetupInternal:function(e){Position.absolutize(e.effects[0].element)},afterFinishInternal:function(e){e.effects[0].element.hide().setStyle(b)}},arguments[1]||{}))};Effect.BlindUp=function(b){b=$(b);b.makeClipping();return new Effect.Scale(b,0,Object.extend({scaleContent:false,scaleX:false,restoreAfterFinish:true,afterFinishInternal:function(d){d.element.hide().undoClipping()}},arguments[1]||{}))};Effect.BlindDown=function(d){d=$(d);var b=d.getDimensions();return new Effect.Scale(d,100,Object.extend({scaleContent:false,scaleX:false,scaleFrom:0,scaleMode:{originalHeight:b.height,originalWidth:b.width},restoreAfterFinish:true,afterSetup:function(e){e.element.makeClipping().setStyle({height:"0px"}).show()},afterFinishInternal:function(e){e.element.undoClipping()}},arguments[1]||{}))};Effect.SwitchOff=function(d){d=$(d);var b=d.getInlineOpacity();return new Effect.Appear(d,Object.extend({duration:0.4,from:0,transition:Effect.Transitions.flicker,afterFinishInternal:function(e){new Effect.Scale(e.element,1,{duration:0.3,scaleFromCenter:true,scaleX:false,scaleContent:false,restoreAfterFinish:true,beforeSetup:function(f){f.element.makePositioned().makeClipping()},afterFinishInternal:function(f){f.element.hide().undoClipping().undoPositioned().setStyle({opacity:b})}})}},arguments[1]||{}))};Effect.DropOut=function(d){d=$(d);var b={top:d.getStyle("top"),left:d.getStyle("left"),opacity:d.getInlineOpacity()};return new Effect.Parallel([new Effect.Move(d,{x:0,y:100,sync:true}),new Effect.Opacity(d,{sync:true,to:0})],Object.extend({duration:0.5,beforeSetup:function(e){e.effects[0].element.makePositioned()},afterFinishInternal:function(e){e.effects[0].element.hide().undoPositioned().setStyle(b)}},arguments[1]||{}))};Effect.Shake=function(f){f=$(f);var d=Object.extend({distance:20,duration:0.5},arguments[1]||{});var g=parseFloat(d.distance);var e=parseFloat(d.duration)/10;var b={top:f.getStyle("top"),left:f.getStyle("left")};return new Effect.Move(f,{x:g,y:0,duration:e,afterFinishInternal:function(h){new Effect.Move(h.element,{x:-g*2,y:0,duration:e*2,afterFinishInternal:function(l){new Effect.Move(l.element,{x:g*2,y:0,duration:e*2,afterFinishInternal:function(n){new Effect.Move(n.element,{x:-g*2,y:0,duration:e*2,afterFinishInternal:function(o){new Effect.Move(o.element,{x:g*2,y:0,duration:e*2,afterFinishInternal:function(p){new Effect.Move(p.element,{x:-g,y:0,duration:e,afterFinishInternal:function(q){q.element.undoPositioned().setStyle(b)}})}})}})}})}})}})};Effect.SlideDown=function(e){e=$(e).cleanWhitespace();var b=e.down().getStyle("bottom");var d=e.getDimensions();return new Effect.Scale(e,100,Object.extend({scaleContent:false,scaleX:false,scaleFrom:window.opera?0:1,scaleMode:{originalHeight:d.height,originalWidth:d.width},restoreAfterFinish:true,afterSetup:function(f){f.element.makePositioned();f.element.down().makePositioned();if(window.opera){f.element.setStyle({top:""})}f.element.makeClipping().setStyle({height:"0px"}).show()},afterUpdateInternal:function(f){f.element.down().setStyle({bottom:(f.dims[0]-f.element.clientHeight)+"px"})},afterFinishInternal:function(f){f.element.undoClipping().undoPositioned();f.element.down().undoPositioned().setStyle({bottom:b})}},arguments[1]||{}))};Effect.SlideUp=function(e){e=$(e).cleanWhitespace();var b=e.down().getStyle("bottom");var d=e.getDimensions();return new Effect.Scale(e,window.opera?0:1,Object.extend({scaleContent:false,scaleX:false,scaleMode:"box",scaleFrom:100,scaleMode:{originalHeight:d.height,originalWidth:d.width},restoreAfterFinish:true,afterSetup:function(f){f.element.makePositioned();f.element.down().makePositioned();if(window.opera){f.element.setStyle({top:""})}f.element.makeClipping().show()},afterUpdateInternal:function(f){f.element.down().setStyle({bottom:(f.dims[0]-f.element.clientHeight)+"px"})},afterFinishInternal:function(f){f.element.hide().undoClipping().undoPositioned();f.element.down().undoPositioned().setStyle({bottom:b})}},arguments[1]||{}))};Effect.Squish=function(b){return new Effect.Scale(b,window.opera?1:0,{restoreAfterFinish:true,beforeSetup:function(d){d.element.makeClipping()},afterFinishInternal:function(d){d.element.hide().undoClipping()}})};Effect.Grow=function(e){e=$(e);var d=Object.extend({direction:"center",moveTransition:Effect.Transitions.sinoidal,scaleTransition:Effect.Transitions.sinoidal,opacityTransition:Effect.Transitions.full},arguments[1]||{});var b={top:e.style.top,left:e.style.left,height:e.style.height,width:e.style.width,opacity:e.getInlineOpacity()};var l=e.getDimensions();var n,h;var g,f;switch(d.direction){case"top-left":n=h=g=f=0;break;case"top-right":n=l.width;h=f=0;g=-l.width;break;case"bottom-left":n=g=0;h=l.height;f=-l.height;break;case"bottom-right":n=l.width;h=l.height;g=-l.width;f=-l.height;break;case"center":n=l.width/2;h=l.height/2;g=-l.width/2;f=-l.height/2;break}return new Effect.Move(e,{x:n,y:h,duration:0.01,beforeSetup:function(o){o.element.hide().makeClipping().makePositioned()},afterFinishInternal:function(o){new Effect.Parallel([new Effect.Opacity(o.element,{sync:true,to:1,from:0,transition:d.opacityTransition}),new Effect.Move(o.element,{x:g,y:f,sync:true,transition:d.moveTransition}),new Effect.Scale(o.element,100,{scaleMode:{originalHeight:l.height,originalWidth:l.width},sync:true,scaleFrom:window.opera?1:0,transition:d.scaleTransition,restoreAfterFinish:true})],Object.extend({beforeSetup:function(p){p.effects[0].element.setStyle({height:"0px"}).show()},afterFinishInternal:function(p){p.effects[0].element.undoClipping().undoPositioned().setStyle(b)}},d))}})};Effect.Shrink=function(e){e=$(e);var d=Object.extend({direction:"center",moveTransition:Effect.Transitions.sinoidal,scaleTransition:Effect.Transitions.sinoidal,opacityTransition:Effect.Transitions.none},arguments[1]||{});var b={top:e.style.top,left:e.style.left,height:e.style.height,width:e.style.width,opacity:e.getInlineOpacity()};var h=e.getDimensions();var g,f;switch(d.direction){case"top-left":g=f=0;break;case"top-right":g=h.width;f=0;break;case"bottom-left":g=0;f=h.height;break;case"bottom-right":g=h.width;f=h.height;break;case"center":g=h.width/2;f=h.height/2;break}return new Effect.Parallel([new Effect.Opacity(e,{sync:true,to:0,from:1,transition:d.opacityTransition}),new Effect.Scale(e,window.opera?1:0,{sync:true,transition:d.scaleTransition,restoreAfterFinish:true}),new Effect.Move(e,{x:g,y:f,sync:true,transition:d.moveTransition})],Object.extend({beforeStartInternal:function(l){l.effects[0].element.makePositioned().makeClipping()},afterFinishInternal:function(l){l.effects[0].element.hide().undoClipping().undoPositioned().setStyle(b)}},d))};Effect.Pulsate=function(e){e=$(e);var d=arguments[1]||{},b=e.getInlineOpacity(),g=d.transition||Effect.Transitions.linear,f=function(h){return 1-g((-Math.cos((h*(d.pulses||5)*2)*Math.PI)/2)+0.5)};return new Effect.Opacity(e,Object.extend(Object.extend({duration:2,from:0,afterFinishInternal:function(h){h.element.setStyle({opacity:b})}},d),{transition:f}))};Effect.Fold=function(d){d=$(d);var b={top:d.style.top,left:d.style.left,width:d.style.width,height:d.style.height};d.makeClipping();return new Effect.Scale(d,5,Object.extend({scaleContent:false,scaleX:false,afterFinishInternal:function(e){new Effect.Scale(d,1,{scaleContent:false,scaleY:false,afterFinishInternal:function(f){f.element.hide().undoClipping().setStyle(b)}})}},arguments[1]||{}))};Effect.Morph=Class.create(Effect.Base,{initialize:function(e){this.element=$(e);if(!this.element){throw (Effect._elementDoesNotExistError)}var b=Object.extend({style:{}},arguments[1]||{});if(!Object.isString(b.style)){this.style=$H(b.style)}else{if(b.style.include(":")){this.style=b.style.parseStyle()}else{this.element.addClassName(b.style);this.style=$H(this.element.getStyles());this.element.removeClassName(b.style);var d=this.element.getStyles();this.style=this.style.reject(function(f){return f.value==d[f.key]});b.afterFinishInternal=function(f){f.element.addClassName(f.options.style);f.transforms.each(function(g){f.element.style[g.style]=""})}}}this.start(b)},setup:function(){function b(d){if(!d||["rgba(0, 0, 0, 0)","transparent"].include(d)){d="#ffffff"}d=d.parseColor();return $R(0,2).map(function(e){return parseInt(d.slice(e*2+1,e*2+3),16)})}this.transforms=this.style.map(function(l){var h=l[0],g=l[1],f=null;if(g.parseColor("#zzzzzz")!="#zzzzzz"){g=g.parseColor();f="color"}else{if(h=="opacity"){g=parseFloat(g);if(Prototype.Browser.IE&&(!this.element.currentStyle.hasLayout)){this.element.setStyle({zoom:1})}}else{if(Element.CSS_LENGTH.test(g)){var e=g.match(/^([\+\-]?[0-9\.]+)(.*)$/);g=parseFloat(e[1]);f=(e.length==3)?e[2]:null}}}var d=this.element.getStyle(h);return{style:h.camelize(),originalValue:f=="color"?b(d):parseFloat(d||0),targetValue:f=="color"?b(g):g,unit:f}}.bind(this)).reject(function(d){return((d.originalValue==d.targetValue)||(d.unit!="color"&&(isNaN(d.originalValue)||isNaN(d.targetValue))))})},update:function(b){var f={},d,e=this.transforms.length;while(e--){f[(d=this.transforms[e]).style]=d.unit=="color"?"#"+(Math.round(d.originalValue[0]+(d.targetValue[0]-d.originalValue[0])*b)).toColorPart()+(Math.round(d.originalValue[1]+(d.targetValue[1]-d.originalValue[1])*b)).toColorPart()+(Math.round(d.originalValue[2]+(d.targetValue[2]-d.originalValue[2])*b)).toColorPart():(d.originalValue+(d.targetValue-d.originalValue)*b).toFixed(3)+(d.unit===null?"":d.unit)}this.element.setStyle(f,true)}});Effect.Transform=Class.create({initialize:function(b){this.tracks=[];this.options=arguments[1]||{};this.addTracks(b)},addTracks:function(b){b.each(function(d){d=$H(d);var e=d.values().first();this.tracks.push($H({ids:d.keys().first(),effect:Effect.Morph,options:{style:e}}))}.bind(this));return this},play:function(){return new Effect.Parallel(this.tracks.map(function(b){var f=b.get("ids"),e=b.get("effect"),d=b.get("options");var g=[$(f)||$$(f)].flatten();return g.map(function(h){return new e(h,Object.extend({sync:true},d))})}).flatten(),this.options)}});Element.CSS_PROPERTIES=$w("backgroundColor backgroundPosition borderBottomColor borderBottomStyle borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth borderRightColor borderRightStyle borderRightWidth borderSpacing borderTopColor borderTopStyle borderTopWidth bottom clip color fontSize fontWeight height left letterSpacing lineHeight marginBottom marginLeft marginRight marginTop markerOffset maxHeight maxWidth minHeight minWidth opacity outlineColor outlineOffset outlineWidth paddingBottom paddingLeft paddingRight paddingTop right textIndent top width wordSpacing zIndex");Element.CSS_LENGTH=/^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;String.__parseStyleElement=document.createElement("div");String.prototype.parseStyle=function(){var d,b=$H();if(Prototype.Browser.WebKit){d=new Element("div",{style:this}).style}else{String.__parseStyleElement.innerHTML='<div style="'+this+'"></div>';d=String.__parseStyleElement.childNodes[0].style}Element.CSS_PROPERTIES.each(function(e){if(d[e]){b.set(e,d[e])}});if(Prototype.Browser.IE&&this.include("opacity")){b.set("opacity",this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1])}return b};if(document.defaultView&&document.defaultView.getComputedStyle){Element.getStyles=function(d){var b=document.defaultView.getComputedStyle($(d),null);return Element.CSS_PROPERTIES.inject({},function(e,f){e[f]=b[f];return e})}}else{Element.getStyles=function(d){d=$(d);var b=d.currentStyle,e;e=Element.CSS_PROPERTIES.inject({},function(f,g){f[g]=b[g];return f});if(!e.opacity){e.opacity=d.getOpacity()}return e}}Effect.Methods={morph:function(b,d){b=$(b);new Effect.Morph(b,Object.extend({style:d},arguments[2]||{}));return b},visualEffect:function(e,g,d){e=$(e);var f=g.dasherize().camelize(),b=f.charAt(0).toUpperCase()+f.substring(1);new Effect[b](e,d);return e},highlight:function(d,b){d=$(d);new Effect.Highlight(d,b);return d}};$w("fade appear grow shrink fold blindUp blindDown slideUp slideDown pulsate shake puff squish switchOff dropOut").each(function(b){Effect.Methods[b]=function(e,d){e=$(e);Effect[b.charAt(0).toUpperCase()+b.substring(1)](e,d);return e}});$w("getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles").each(function(b){Effect.Methods[b]=Element[b]});Element.addMethods(Effect.Methods);function validateCreditCard(e){var d="0123456789";var b="";for(i=0;i<e.length;i++){x=e.charAt(i);if(d.indexOf(x,0)!=-1){b+=x}}j=b.length/2;k=Math.floor(j);m=Math.ceil(j)-k;c=0;for(i=0;i<k;i++){a=b.charAt(i*2+m)*2;c+=a>9?Math.floor(a/10+a%10):a}for(i=0;i<k+m;i++){c+=b.charAt(i*2+1-m)*1}return(c%10==0)}var Validator=Class.create();Validator.prototype={initialize:function(e,d,f,b){if(typeof f=="function"){this.options=$H(b);this._test=f}else{this.options=$H(f);this._test=function(){return true}}this.error=d||"Validation failed.";this.className=e},test:function(b,d){return(this._test(b,d)&&this.options.all(function(e){return Validator.methods[e.key]?Validator.methods[e.key](b,d,e.value):true}))}};Validator.methods={pattern:function(b,e,d){return Validation.get("IsEmpty").test(b)||d.test(b)},minLength:function(b,e,d){return b.length>=d},maxLength:function(b,e,d){return b.length<=d},min:function(b,e,d){return b>=parseFloat(d)},max:function(b,e,d){return b<=parseFloat(d)},notOneOf:function(b,e,d){return $A(d).all(function(f){return b!=f})},oneOf:function(b,e,d){return $A(d).any(function(f){return b==f})},is:function(b,e,d){return b==d},isNot:function(b,e,d){return b!=d},equalToField:function(b,e,d){return b==$F(d)},notEqualToField:function(b,e,d){return b!=$F(d)},include:function(b,e,d){return $A(d).all(function(f){return Validation.get(f).test(b,e)})}};var Validation=Class.create();Validation.defaultOptions={onSubmit:true,stopOnFirst:false,immediate:false,focusOnError:true,useTitles:false,addClassNameToContainer:false,containerClassName:".input-box",onFormValidate:function(b,d){},onElementValidate:function(b,d){}};Validation.prototype={initialize:function(d,b){this.form=$(d);if(!this.form){return}this.options=Object.extend({onSubmit:Validation.defaultOptions.onSubmit,stopOnFirst:Validation.defaultOptions.stopOnFirst,immediate:Validation.defaultOptions.immediate,focusOnError:Validation.defaultOptions.focusOnError,useTitles:Validation.defaultOptions.useTitles,onFormValidate:Validation.defaultOptions.onFormValidate,onElementValidate:Validation.defaultOptions.onElementValidate},b||{});if(this.options.onSubmit){Event.observe(this.form,"submit",this.onSubmit.bind(this),false)}if(this.options.immediate){Form.getElements(this.form).each(function(e){if(e.tagName.toLowerCase()=="select"){Event.observe(e,"blur",this.onChange.bindAsEventListener(this))}if(e.type.toLowerCase()=="radio"||e.type.toLowerCase()=="checkbox"){Event.observe(e,"click",this.onChange.bindAsEventListener(this))}else{Event.observe(e,"change",this.onChange.bindAsEventListener(this))}},this)}},onChange:function(b){Validation.isOnChange=true;Validation.validate(Event.element(b),{useTitle:this.options.useTitles,onElementValidate:this.options.onElementValidate});Validation.isOnChange=false},onSubmit:function(b){if(!this.validate()){Event.stop(b)}},validate:function(){var b=false;var d=this.options.useTitles;var g=this.options.onElementValidate;try{if(this.options.stopOnFirst){b=Form.getElements(this.form).all(function(e){if(e.hasClassName("local-validation")&&!this.isElementInForm(e,this.form)){return true}return Validation.validate(e,{useTitle:d,onElementValidate:g})},this)}else{b=Form.getElements(this.form).collect(function(e){if(e.hasClassName("local-validation")&&!this.isElementInForm(e,this.form)){return true}if(e.hasClassName("validation-disabled")){return true}return Validation.validate(e,{useTitle:d,onElementValidate:g})},this).all()}}catch(f){}if(!b&&this.options.focusOnError){try{Form.getElements(this.form).findAll(function(e){return $(e).hasClassName("validation-failed")}).first().focus()}catch(f){}}this.options.onFormValidate(b,this.form);return b},reset:function(){Form.getElements(this.form).each(Validation.reset)},isElementInForm:function(e,d){var b=e.up("form");if(b==d){return true}return false}};Object.extend(Validation,{validate:function(e,b){b=Object.extend({useTitle:false,onElementValidate:function(f,g){}},b||{});e=$(e);var d=$w(e.className);return result=d.all(function(f){var g=Validation.test(f,e,b.useTitle);b.onElementValidate(g,e);return g})},insertAdvice:function(f,d){var b=$(f).up(".field-row");if(b){Element.insert(b,{after:d})}else{if(f.up("td.value")){f.up("td.value").insert({bottom:d})}else{if(f.advaiceContainer&&$(f.advaiceContainer)){$(f.advaiceContainer).update(d)}else{switch(f.type.toLowerCase()){case"checkbox":case"radio":var e=f.parentNode;if(e){Element.insert(e,{bottom:d})}else{Element.insert(f,{after:d})}break;default:Element.insert(f,{after:d})}}}}},showAdvice:function(e,d,b){if(!e.advices){e.advices=new Hash()}else{e.advices.each(function(f){if(!d||f.value.id!=d.id){this.hideAdvice(e,f.value)}}.bind(this))}e.advices.set(b,d);if(typeof Effect=="undefined"){d.style.display="block"}else{if(!d._adviceAbsolutize){new Effect.Appear(d,{duration:1})}else{Position.absolutize(d);d.show();d.setStyle({top:d._adviceTop,left:d._adviceLeft,width:d._adviceWidth,"z-index":1000});d.addClassName("advice-absolute")}}},hideAdvice:function(d,b){if(b!=null){new Effect.Fade(b,{duration:1,afterFinishInternal:function(){b.hide()}})}},updateCallback:function(elm,status){if(typeof elm.callbackFunction!="undefined"){eval(elm.callbackFunction+"('"+elm.id+"','"+status+"')")}},ajaxError:function(g,f){var e="validate-ajax";var d=Validation.getAdvice(e,g);if(d==null){d=this.createAdvice(e,g,false,f)}this.showAdvice(g,d,"validate-ajax");this.updateCallback(g,"failed");g.addClassName("validation-failed");g.addClassName("validate-ajax");if(Validation.defaultOptions.addClassNameToContainer&&Validation.defaultOptions.containerClassName!=""){var b=g.up(Validation.defaultOptions.containerClassName);if(b&&this.allowContainerClassName(g)){b.removeClassName("validation-passed");b.addClassName("validation-error")}}},allowContainerClassName:function(b){if(b.type=="radio"||b.type=="checkbox"){return b.hasClassName("change-container-classname")}return true},test:function(g,o,l){var d=Validation.get(g);var n="__advice"+g.camelize();try{if(Validation.isVisible(o)&&!d.test($F(o),o)){var f=Validation.getAdvice(g,o);if(f==null){f=this.createAdvice(g,o,l)}this.showAdvice(o,f,g);this.updateCallback(o,"failed");o[n]=1;if(!o.advaiceContainer){o.removeClassName("validation-passed");o.addClassName("validation-failed")}if(Validation.defaultOptions.addClassNameToContainer&&Validation.defaultOptions.containerClassName!=""){var b=o.up(Validation.defaultOptions.containerClassName);if(b&&this.allowContainerClassName(o)){b.removeClassName("validation-passed");b.addClassName("validation-error")}}return false}else{var f=Validation.getAdvice(g,o);this.hideAdvice(o,f);this.updateCallback(o,"passed");o[n]="";o.removeClassName("validation-failed");o.addClassName("validation-passed");if(Validation.defaultOptions.addClassNameToContainer&&Validation.defaultOptions.containerClassName!=""){var b=o.up(Validation.defaultOptions.containerClassName);if(b&&!b.down(".validation-failed")&&this.allowContainerClassName(o)){if(!Validation.get("IsEmpty").test(o.value)||!this.isVisible(o)){b.addClassName("validation-passed")}else{b.removeClassName("validation-passed")}b.removeClassName("validation-error")}}return true}}catch(h){throw (h)}},isVisible:function(b){while(b.tagName!="BODY"){if(!$(b).visible()){return false}b=b.parentNode}return true},getAdvice:function(b,d){return $("advice-"+b+"-"+Validation.getElmID(d))||$("advice-"+Validation.getElmID(d))},createAdvice:function(e,n,l,d){var b=Validation.get(e);var h=l?((n&&n.title)?n.title:b.error):b.error;if(d){h=d}if(jQuery.mage.__){h=jQuery.mage.__(h)}advice='<div class="validation-advice" id="advice-'+e+"-"+Validation.getElmID(n)+'" style="display:none">'+h+"</div>";Validation.insertAdvice(n,advice);advice=Validation.getAdvice(e,n);if($(n).hasClassName("absolute-advice")){var g=$(n).getDimensions();var f=Position.cumulativeOffset(n);advice._adviceTop=(f[1]+g.height)+"px";advice._adviceLeft=(f[0])+"px";advice._adviceWidth=(g.width)+"px";advice._adviceAbsolutize=true}return advice},getElmID:function(b){return b.id?b.id:b.name},reset:function(d){d=$(d);var b=$w(d.className);b.each(function(g){var h="__advice"+g.camelize();if(d[h]){var f=Validation.getAdvice(g,d);if(f){f.hide()}d[h]=""}d.removeClassName("validation-failed");d.removeClassName("validation-passed");if(Validation.defaultOptions.addClassNameToContainer&&Validation.defaultOptions.containerClassName!=""){var e=d.up(Validation.defaultOptions.containerClassName);if(e){e.removeClassName("validation-passed");e.removeClassName("validation-error")}}})},add:function(f,e,g,d){var b={};b[f]=new Validator(f,e,g,d);Object.extend(Validation.methods,b)},addAllThese:function(b){var d={};$A(b).each(function(e){d[e[0]]=new Validator(e[0],e[1],e[2],(e.length>3?e[3]:{}))});Object.extend(Validation.methods,d)},get:function(b){return Validation.methods[b]?Validation.methods[b]:Validation.methods._LikeNoIDIEverSaw_},methods:{_LikeNoIDIEverSaw_:new Validator("_LikeNoIDIEverSaw_","",{})}});Validation.add("IsEmpty","",function(b){return(b==""||(b==null)||(b.length==0)||/^\s+$/.test(b))});Validation.addAllThese([["validate-no-html-tags","HTML tags are not allowed",function(b){return !/<(\/)?\w+/.test(b)}],["validate-select","Please select an option.",function(b){return((b!="none")&&(b!=null)&&(b.length!=0))}],["required-entry","This is a required field.",function(b){return !Validation.get("IsEmpty").test(b)}],["validate-number","Please enter a valid number in this field.",function(b){return Validation.get("IsEmpty").test(b)||(!isNaN(parseNumber(b))&&/^\s*-?\d*(\.\d*)?\s*$/.test(b))}],["validate-number-range","The value is not within the specified range.",function(e,g){if(Validation.get("IsEmpty").test(e)){return true}var f=parseNumber(e);if(isNaN(f)){return false}var d=/^number-range-(-?[\d.,]+)?-(-?[\d.,]+)?$/,b=true;$w(g.className).each(function(l){var h=d.exec(l);if(h){b=b&&(h[1]==null||h[1]==""||f>=parseNumber(h[1]))&&(h[2]==null||h[2]==""||f<=parseNumber(h[2]))}});return b}],["validate-digits","Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.",function(b){return Validation.get("IsEmpty").test(b)||!/[^\d]/.test(b)}],["validate-digits-range","The value is not within the specified range.",function(e,g){if(Validation.get("IsEmpty").test(e)){return true}var f=parseNumber(e);if(isNaN(f)){return false}var d=/^digits-range-(-?\d+)?-(-?\d+)?$/,b=true;$w(g.className).each(function(l){var h=d.exec(l);if(h){b=b&&(h[1]==null||h[1]==""||f>=parseNumber(h[1]))&&(h[2]==null||h[2]==""||f<=parseNumber(h[2]))}});return b}],["validate-range","The value is not within the specified range.",function(f,l){var g,h;if(Validation.get("IsEmpty").test(f)){return true}else{if(Validation.get("validate-digits").test(f)){g=h=parseNumber(f)}else{var e=/^(-?\d+)?-(-?\d+)?$/.exec(f);if(e){g=parseNumber(e[1]);h=parseNumber(e[2]);if(g>h){return false}}else{return false}}}var d=/^range-(-?\d+)?-(-?\d+)?$/,b=true;$w(l.className).each(function(n){var q=d.exec(n);if(q){var p=parseNumber(q[1]);var o=parseNumber(q[2]);b=b&&(isNaN(p)||g>=p)&&(isNaN(o)||h<=o)}});return b}],["validate-alpha","Please use letters only (a-z or A-Z) in this field.",function(b){return Validation.get("IsEmpty").test(b)||/^[a-zA-Z]+$/.test(b)}],["validate-code","Please use only letters (a-z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.",function(b){return Validation.get("IsEmpty").test(b)||/^[a-z]+[a-z0-9_]+$/.test(b)}],["validate-alphanum","Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.",function(b){return Validation.get("IsEmpty").test(b)||/^[a-zA-Z0-9]+$/.test(b)}],["validate-alphanum-with-spaces","Please use only letters (a-z or A-Z), numbers (0-9) or spaces only in this field.",function(b){return Validation.get("IsEmpty").test(b)||/^[a-zA-Z0-9 ]+$/.test(b)}],["validate-street",'Please use only letters (a-z or A-Z), numbers (0-9), spaces and "#" in this field.',function(b){return Validation.get("IsEmpty").test(b)||/^[ \w]{3,}([A-Za-z]\.)?([ \w]*\#\d+)?(\r\n| )[ \w]{3,}/.test(b)}],["validate-phoneStrict","Please enter a valid phone number (Ex: 123-456-7890).",function(b){return Validation.get("IsEmpty").test(b)||/^(\()?\d{3}(\))?(-|\s)?\d{3}(-|\s)\d{4}$/.test(b)}],["validate-phoneLax","Please enter a valid phone number (Ex: 123-456-7890).",function(b){return Validation.get("IsEmpty").test(b)||/^((\d[-. ]?)?((\(\d{3}\))|\d{3}))?[-. ]?\d{3}[-. ]?\d{4}$/.test(b)}],["validate-fax","Please enter a valid fax number (Ex: 123-456-7890).",function(b){return Validation.get("IsEmpty").test(b)||/^(\()?\d{3}(\))?(-|\s)?\d{3}(-|\s)\d{4}$/.test(b)}],["validate-date","Please enter a valid date.",function(b){var d=new Date(b);return Validation.get("IsEmpty").test(b)||!isNaN(d)}],["validate-date-range","Make sure the To Date is later than or the same as the From Date.",function(e,h){var d=/\bdate-range-(\w+)-(\w+)\b/.exec(h.className);if(!d||d[2]=="to"||Validation.get("IsEmpty").test(e)){return true}var f=new Date().getFullYear()+"";var b=function(l){l=l.split(/[.\/]/);if(l[2]&&l[2].length<4){l[2]=f.substr(0,l[2].length)+l[2]}return new Date(l.join("/")).getTime()};var g=Element.select(h.form,".validate-date-range.date-range-"+d[1]+"-to");return !g.length||Validation.get("IsEmpty").test(g[0].value)||b(e)<=b(g[0].value)}],["validate-email","Please enter a valid email address (Ex: johndoe@domain.com).",function(b){return Validation.get("IsEmpty").test(b)||/^([a-z0-9,!\#\$%&'\*\+\/=\?\^_`\{\|\}~-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z0-9,!\#\$%&'\*\+\/=\?\^_`\{\|\}~-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*@([a-z0-9-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z0-9-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*\.(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]){2,})$/i.test(b)}],["validate-emailSender","Please use only visible characters and spaces.",function(b){return Validation.get("IsEmpty").test(b)||/^[\S ]+$/.test(b)}],["validate-password","Please enter 6 or more characters. Leading and trailing spaces will be ignored.",function(b){var d=b.strip();return !(d.length>0&&d.length<6)}],["validate-admin-password","Please enter 7 or more characters, using both numeric and alphabetic.",function(b){var d=b.strip();if(0==d.length){return true}if(!(/[a-z]/i.test(b))||!(/[0-9]/.test(b))){return false}return !(d.length<7)}],["validate-cpassword","Please make sure your passwords match.",function(b){var d=$("confirmation")?$("confirmation"):$$(".validate-cpassword")[0];var g=false;if($("password")){g=$("password")}var h=$$(".validate-password");for(var e=0;e<h.size();e++){var f=h[e];if(f.up("form").id==d.up("form").id){g=f}}if($$(".validate-admin-password").size()){g=$$(".validate-admin-password")[0]}return(g.value==d.value)}],["validate-both-passwords","Please make sure your passwords match.",function(e,d){var b=$(d.form[d.name=="password"?"confirmation":"password"]),f=d.value==b.value;if(f&&b.hasClassName("validation-failed")){Validation.test(this.className,b)}return b.value==""||f}],["validate-url","Please enter a valid URL. Protocol is required (http://, https:// or ftp://)",function(b){b=(b||"").replace(/^\s+/,"").replace(/\s+$/,"");return Validation.get("IsEmpty").test(b)||/^(http|https|ftp):\/\/(([A-Z0-9]([A-Z0-9_-]*[A-Z0-9]|))(\.[A-Z0-9]([A-Z0-9_-]*[A-Z0-9]|))*)(:(\d+))?(\/[A-Z0-9~](([A-Z0-9_~-]|\.)*[A-Z0-9~]|))*\/?(.*)?$/i.test(b)}],["validate-clean-url",'Please enter a valid URL (Ex: "http://www.example.com" or "www.example.com").',function(b){return Validation.get("IsEmpty").test(b)||/^(http|https|ftp):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+.(com|org|net|dk|at|us|tv|info|uk|co.uk|biz|se)$)(:(\d+))?\/?/i.test(b)||/^(www)((\.[A-Z0-9][A-Z0-9_-]*)+.(com|org|net|dk|at|us|tv|info|uk|co.uk|biz|se)$)(:(\d+))?\/?/i.test(b)}],["validate-identifier",'Please enter a valid URL Key (Ex: "example-page", "example-page.html" or "anotherlevel/example-page").',function(b){return Validation.get("IsEmpty").test(b)||/^[a-z0-9][a-z0-9_\/-]+(\.[a-z0-9_-]+)?$/.test(b)}],["validate-xml-identifier","Please enter a valid XML-identifier (Ex: something_1, block5, id-4).",function(b){return Validation.get("IsEmpty").test(b)||/^[A-Z][A-Z0-9_\/-]*$/i.test(b)}],["validate-ssn","Please enter a valid social security number (Ex: 123-45-6789).",function(b){return Validation.get("IsEmpty").test(b)||/^\d{3}-?\d{2}-?\d{4}$/.test(b)}],["validate-zip-us","Please enter a valid zip code (Ex: 90602 or 90602-1234).",function(b){return Validation.get("IsEmpty").test(b)||/(^\d{5}$)|(^\d{5}-\d{4}$)/.test(b)}],["validate-zip-international","Please enter a valid zip code.",function(b){return true}],["validate-date-au",'Please use this date format: dd/mm/yyyy (Ex: "17/03/2006" for the 17th of March, 2006).',function(b){if(Validation.get("IsEmpty").test(b)){return true}var e=/^(\d{2})\/(\d{2})\/(\d{4})$/;if(!e.test(b)){return false}var f=new Date(b.replace(e,"$2/$1/$3"));return(parseInt(RegExp.$2,10)==(1+f.getMonth()))&&(parseInt(RegExp.$1,10)==f.getDate())&&(parseInt(RegExp.$3,10)==f.getFullYear())}],["validate-currency-dollar","Please enter a valid $ amount (Ex: $100.00).",function(b){return Validation.get("IsEmpty").test(b)||/^\$?\-?([1-9]{1}[0-9]{0,2}(\,[0-9]{3})*(\.[0-9]{0,2})?|[1-9]{1}\d*(\.[0-9]{0,2})?|0(\.[0-9]{0,2})?|(\.[0-9]{1,2})?)$/.test(b)}],["validate-one-required","Please select one of the options above.",function(b,f){var e=f.parentNode;var d=e.getElementsByTagName("INPUT");return $A(d).any(function(g){return $F(g)})}],["validate-one-required-by-name","Please select one of the options.",function(d,g){var b=$$('input[name="'+g.name.replace(/([\\"])/g,"\\$1")+'"]');var e=1;for(var f=0;f<b.length;f++){if((b[f].type=="checkbox"||b[f].type=="radio")&&b[f].checked==true){e=0}if(Validation.isOnChange&&(b[f].type=="checkbox"||b[f].type=="radio")){Validation.reset(b[f])}}if(e==0){return true}else{return false}}],["validate-not-negative-number","Please enter a number 0 or greater in this field.",function(b){if(Validation.get("IsEmpty").test(b)){return true}b=parseNumber(b);return !isNaN(b)&&b>=0}],["validate-zero-or-greater","Please enter a number 0 or greater in this field.",function(b){return Validation.get("validate-not-negative-number").test(b)}],["validate-greater-than-zero","Please enter a number greater than 0 in this field.",function(b){if(Validation.get("IsEmpty").test(b)){return true}b=parseNumber(b);return !isNaN(b)&&b>0}],["validate-state","Please select State/Province.",function(b){return(b!=0||b=="")}],["validate-new-password","Please enter 6 or more characters. Leading and trailing spaces will be ignored.",function(b){if(!Validation.get("validate-password").test(b)){return false}if(Validation.get("IsEmpty").test(b)&&b!=""){return false}return true}],["validate-cc-number","Please enter a valid credit card number.",function(b,e){var d=$(e.id.substr(0,e.id.indexOf("_cc_number"))+"_cc_type");if(d&&typeof Validation.creditCartTypes.get(d.value)!="undefined"&&Validation.creditCartTypes.get(d.value)[2]==false){if(!Validation.get("IsEmpty").test(b)&&Validation.get("validate-digits").test(b)){return true}else{return false}}return validateCreditCard(b)}],["validate-cc-type","Credit card number does not match credit card type.",function(d,g){g.value=removeDelimiters(g.value);d=removeDelimiters(d);var f=$(g.id.substr(0,g.id.indexOf("_cc_number"))+"_cc_type");if(!f){return true}var e=f.value;if(typeof Validation.creditCartTypes.get(e)=="undefined"){return false}if(Validation.creditCartTypes.get(e)[0]==false){return true}var b="";Validation.creditCartTypes.each(function(h){if(h.value[0]&&d.match(h.value[0])){b=h.key;throw $break}});if(b!=e){return false}if(f.hasClassName("validation-failed")&&Validation.isOnChange){Validation.validate(f)}return true}],["validate-cc-type-select","Card type does not match credit card number.",function(d,e){var b=$(e.id.substr(0,e.id.indexOf("_cc_type"))+"_cc_number");if(Validation.isOnChange&&Validation.get("IsEmpty").test(b.value)){return true}if(Validation.get("validate-cc-type").test(b.value,b)){Validation.validate(b)}return Validation.get("validate-cc-type").test(b.value,b)}],["validate-cc-exp","Incorrect credit card expiration date.",function(b,l){var h=b;var g=$(l.id.substr(0,l.id.indexOf("_expiration"))+"_expiration_yr").value;var f=new Date();var e=f.getMonth()+1;var d=f.getFullYear();if(h<e&&g==d){return false}return true}],["validate-cc-cvn","Please enter a valid credit card verification number.",function(b,g){var f=$(g.id.substr(0,g.id.indexOf("_cc_cid"))+"_cc_type");if(!f){return true}var d=f.value;if(typeof Validation.creditCartTypes.get(d)=="undefined"){return false}var e=Validation.creditCartTypes.get(d)[1];if(b.match(e)){return true}return false}],["validate-ajax","",function(b,d){return true}],["validate-data","Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.",function(b){if(b!=""&&b){return/^[A-Za-z]+[A-Za-z0-9_]+$/.test(b)}return true}],["validate-css-length","Please input a valid CSS-length (Ex: 100px, 77pt, 20em, .5ex or 50%).",function(b){if(b!=""&&b){return/^[0-9\.]+(px|pt|em|ex|%)?$/.test(b)&&(!(/\..*\./.test(b)))&&!(/\.$/.test(b))}return true}],["validate-length","Text length does not meet the specified text range.",function(d,g){var e=new RegExp(/^maximum-length-[0-9]+$/);var f=new RegExp(/^minimum-length-[0-9]+$/);var b=true;$w(g.className).each(function(l,h){if(l.match(e)&&b){var n=l.split("-")[2];b=(d.length<=n)}if(l.match(f)&&b&&!Validation.get("IsEmpty").test(d)){var n=l.split("-")[2];b=(d.length>=n)}});return b}],["validate-percents","Please enter a number lower than 100.",{max:100}],["required-file","Please select a file.",function(d,e){var b=!Validation.get("IsEmpty").test(d);if(b===false){ovId=e.id+"_value";if($(ovId)){b=!Validation.get("IsEmpty").test($(ovId).value)}}return b}],["validate-cc-ukss","Please enter issue number or start date for switch/solo card type.",function(o,g){var b;if(g.id.match(/(.)+_cc_issue$/)){b=g.id.indexOf("_cc_issue")}else{if(g.id.match(/(.)+_start_month$/)){b=g.id.indexOf("_start_month")}else{b=g.id.indexOf("_start_year")}}var f=g.id.substr(0,b);var d=$(f+"_cc_type");if(!d){return true}var n=d.value;if(["SS","SM","SO"].indexOf(n)==-1){return true}$(f+"_cc_issue").advaiceContainer=$(f+"_start_month").advaiceContainer=$(f+"_start_year").advaiceContainer=$(f+"_cc_type_ss_div").down(".adv-container");var h=$(f+"_cc_issue").value;var l=$(f+"_start_month").value;var p=$(f+"_start_year").value;var e=(l&&p)?true:false;if(!e&&!h){return false}return true}]]);function removeDelimiters(b){b=b.replace(/\s/g,"");b=b.replace(/\-/g,"");return b}function parseNumber(b){if(typeof b!="string"){return parseFloat(b)}var e=b.indexOf(".");var d=b.indexOf(",");if(e!=-1&&d!=-1){if(d>e){b=b.replace(".","").replace(",",".")}else{b=b.replace(",","")}}else{if(d!=-1){b=b.replace(",",".")}}return parseFloat(b)}Validation.creditCartTypes=$H({SO:[new RegExp("^(6334[5-9]([0-9]{11}|[0-9]{13,14}))|(6767([0-9]{12}|[0-9]{14,15}))$"),new RegExp("^([0-9]{3}|[0-9]{4})?$"),true],SM:[new RegExp("(^(5[0678])[0-9]{11,18}$)|(^(6[^05])[0-9]{11,18}$)|(^(601)[^1][0-9]{9,16}$)|(^(6011)[0-9]{9,11}$)|(^(6011)[0-9]{13,16}$)|(^(65)[0-9]{11,13}$)|(^(65)[0-9]{15,18}$)|(^(49030)[2-9]([0-9]{10}$|[0-9]{12,13}$))|(^(49033)[5-9]([0-9]{10}$|[0-9]{12,13}$))|(^(49110)[1-2]([0-9]{10}$|[0-9]{12,13}$))|(^(49117)[4-9]([0-9]{10}$|[0-9]{12,13}$))|(^(49118)[0-2]([0-9]{10}$|[0-9]{12,13}$))|(^(4936)([0-9]{12}$|[0-9]{14,15}$))"),new RegExp("^([0-9]{3}|[0-9]{4})?$"),true],VI:[new RegExp("^4[0-9]{12}([0-9]{3})?$"),new RegExp("^[0-9]{3}$"),true],MC:[new RegExp("^5[1-5][0-9]{14}$"),new RegExp("^[0-9]{3}$"),true],AE:[new RegExp("^3[47][0-9]{13}$"),new RegExp("^[0-9]{4}$"),true],DI:[new RegExp("^6(011|4[4-9][0-9]|5[0-9]{2})[0-9]{12}$"),new RegExp("^[0-9]{3}$"),true],JCB:[new RegExp("^(3[0-9]{15}|(2131|1800)[0-9]{11})$"),new RegExp("^[0-9]{3,4}$"),true],OT:[false,new RegExp("^([0-9]{3}|[0-9]{4})?$"),false]});function popWin(d,e,b){var e=window.open(d,e,b);e.focus()}function setLocation(b){window.location.href=b}function setPLocation(d,b){if(b){window.opener.focus()}window.opener.location.href=d}function setLanguageCode(e,f){var b=window.location.href;var h="",g;if(g=b.match(/\#(.*)$/)){b=b.replace(/\#(.*)$/,"");h=g[0]}if(b.match(/[?]/)){var d=/([?&]store=)[a-z0-9_]*/;if(b.match(d)){b=b.replace(d,"$1"+e)}else{b+="&store="+e}var d=/([?&]from_store=)[a-z0-9_]*/;if(b.match(d)){b=b.replace(d,"")}}else{b+="?store="+e}if(typeof(f)!="undefined"){b+="&from_store="+f}b+=h;setLocation(b)}function decorateGeneric(h,e){var l=["odd","even","first","last"];var d={};var g=h.length;if(g){if(typeof(e)=="undefined"){e=l}if(!e.length){return}for(var b in l){d[l[b]]=false}for(var b in e){d[e[b]]=true}if(d.first){Element.addClassName(h[0],"first")}if(d.last){Element.addClassName(h[g-1],"last")}for(var f=0;f<g;f++){if((f+1)%2==0){if(d.even){Element.addClassName(h[f],"even")}}else{if(d.odd){Element.addClassName(h[f],"odd")}}}}}function decorateTable(h,e){var h=$(h);if(h){var b={tbody:false,"tbody tr":["odd","even","first","last"],"thead tr":["first","last"],"tfoot tr":["first","last"],"tr td":["last"]};if(typeof(e)!="undefined"){for(var d in e){b[d]=e[d]}}if(b.tbody){decorateGeneric(h.select("tbody"),b.tbody)}if(b["tbody tr"]){decorateGeneric(h.select("tbody tr"),b["tbody tr"])}if(b["thead tr"]){decorateGeneric(h.select("thead tr"),b["thead tr"])}if(b["tfoot tr"]){decorateGeneric(h.select("tfoot tr"),b["tfoot tr"])}if(b["tr td"]){var g=h.select("tr");if(g.length){for(var f=0;f<g.length;f++){decorateGeneric(g[f].getElementsByTagName("TD"),b["tr td"])}}}}}function decorateList(e,d){if($(e)){if(typeof(d)=="undefined"){var b=$(e).select("li")}else{var b=$(e).childElements()}decorateGeneric(b,["odd","even","last"])}}function decorateDataList(b){b=$(b);if(b){decorateGeneric(b.select("dt"),["odd","even","last"]);decorateGeneric(b.select("dd"),["odd","even","last"])}}function parseSidUrl(f,e){var d=f.indexOf("/?SID=");var b="";e=(e!=undefined)?e:"";if(d>-1){b="?"+f.substring(d+2);f=f.substring(0,d+1)}return f+e+b}function formatCurrency(n,q,g){var l=isNaN(q.precision=Math.abs(q.precision))?2:q.precision;var v=isNaN(q.requiredPrecision=Math.abs(q.requiredPrecision))?2:q.requiredPrecision;l=v;var t=isNaN(q.integerRequired=Math.abs(q.integerRequired))?1:q.integerRequired;var p=q.decimalSymbol==undefined?",":q.decimalSymbol;var e=q.groupSymbol==undefined?".":q.groupSymbol;var d=q.groupLength==undefined?3:q.groupLength;var u="";if(g==undefined||g==true){u=n<0?"-":(g?"+":"")}else{if(g==false){u=""}}var h=parseInt(n=Math.abs(+n||0).toFixed(l))+"";var f=(h.length<t)?(t-h.length):0;while(f){h="0"+h;f--}j=(j=h.length)>d?j%d:0;re=new RegExp("(\\d{"+d+"})(?=\\d)","g");var b=(j?h.substr(0,j)+e:"")+h.substr(j).replace(re,"$1"+e)+(l?p+Math.abs(n-h).toFixed(l).replace(/-/,0).slice(2):"");var o="";if(q.pattern.indexOf("{sign}")==-1){o=u+q.pattern}else{o=q.pattern.replace("{sign}",u)}return o.replace("%s",b).replace(/^\s\s*/,"").replace(/\s\s*$/,"")}function expandDetails(d,b){if(Element.hasClassName(d,"show-details")){$$(b).each(function(e){e.hide()});Element.removeClassName(d,"show-details")}else{$$(b).each(function(e){e.show()});Element.addClassName(d,"show-details")}}var isIE=navigator.appVersion.match(/MSIE/)=="MSIE";if(!window.Varien){var Varien=new Object()}Varien.showLoading=function(){var b=$("loading-process");b&&b.show()};Varien.hideLoading=function(){var b=$("loading-process");b&&b.hide()};Varien.GlobalHandlers={onCreate:function(){Varien.showLoading()},onComplete:function(){if(Ajax.activeRequestCount==0){Varien.hideLoading()}}};Ajax.Responders.register(Varien.GlobalHandlers);Varien.searchForm=Class.create();Varien.searchForm.prototype={initialize:function(d,e,b){this.form=$(d);this.field=$(e);this.emptyText=b;Event.observe(this.form,"submit",this.submit.bind(this));Event.observe(this.field,"focus",this.focus.bind(this));Event.observe(this.field,"blur",this.blur.bind(this));this.blur()},submit:function(b){if(this.field.value==this.emptyText||this.field.value==""){Event.stop(b);return false}return true},focus:function(b){if(this.field.value==this.emptyText){this.field.value=""}},blur:function(b){if(this.field.value==""){this.field.value=this.emptyText}}};Varien.DateElement=Class.create();Varien.DateElement.prototype={initialize:function(b,d,f,e){if(b=="id"){this.day=$(d+"day");this.month=$(d+"month");this.year=$(d+"year");this.full=$(d+"full");this.advice=$(d+"date-advice")}else{if(b=="container"){this.day=d.day;this.month=d.month;this.year=d.year;this.full=d.full;this.advice=d.advice}else{return}}this.required=f;this.format=e;this.day.addClassName("validate-custom");this.day.validate=this.validate.bind(this);this.month.addClassName("validate-custom");this.month.validate=this.validate.bind(this);this.year.addClassName("validate-custom");this.year.validate=this.validate.bind(this);this.setDateRange(false,false);this.year.setAttribute("autocomplete","off");this.advice.hide()},validate:function(){var l=false,o=parseInt(this.day.value,10)||0,f=parseInt(this.month.value,10)||0,h=parseInt(this.year.value,10)||0;if(this.day.value.strip().empty()&&this.month.value.strip().empty()&&this.year.value.strip().empty()){if(this.required){l="Please enter a date."}else{this.full.value=""}}else{if(!o||!f||!h){l="Please enter a valid full date."}else{var d=new Date,n=0,e=null;d.setYear(h);d.setMonth(f-1);d.setDate(32);n=32-d.getDate();if(!n||n>31){n=31}if(o<1||o>n){e="day";l="Please enter a valid day (1-%1)."}else{if(f<1||f>12){e="month";l="Please enter a valid month (1-12)."}else{if(o%10==o){this.day.value="0"+o}if(f%10==f){this.month.value="0"+f}this.full.value=this.format.replace(/%[mb]/i,this.month.value).replace(/%[de]/i,this.day.value).replace(/%y/i,this.year.value);var b=this.month.value+"/"+this.day.value+"/"+this.year.value;var g=new Date(b);if(isNaN(g)){l="Please enter a valid date."}else{this.setFullDate(g)}}}var p=false;if(!l&&!this.validateData()){e=this.validateDataErrorType;p=this.validateDataErrorText;l=p}}}if(l!==false){if(jQuery.mage.__){l=jQuery.mage.__(l)}if(!p){this.advice.innerHTML=l.replace("%1",n)}else{this.advice.innerHTML=this.errorTextModifier(l)}this.advice.show();return false}this.day.removeClassName("validation-failed");this.month.removeClassName("validation-failed");this.year.removeClassName("validation-failed");this.advice.hide();return true},validateData:function(){var d=this.fullDate.getFullYear();var b=new Date;this.curyear=b.getFullYear();return(d>=1900&&d<=this.curyear)},validateDataErrorType:"year",validateDataErrorText:"Please enter a valid year (1900-%1).",errorTextModifier:function(b){return b.replace("%1",this.curyear)},setDateRange:function(b,d){this.minDate=b;this.maxDate=d},setFullDate:function(b){this.fullDate=b}};Varien.DOB=Class.create();Varien.DOB.prototype={initialize:function(b,g,f){var e=$$(b)[0];var d={};d.day=Element.select(e,".dob-day input")[0];d.month=Element.select(e,".dob-month input")[0];d.year=Element.select(e,".dob-year input")[0];d.full=Element.select(e,".dob-full input")[0];d.advice=Element.select(e,".validation-advice")[0];new Varien.DateElement("container",d,g,f)}};Varien.dateRangeDate=Class.create();Varien.dateRangeDate.prototype=Object.extend(new Varien.DateElement(),{validateData:function(){var b=true;if(this.minDate||this.maxValue){if(this.minDate){this.minDate=new Date(this.minDate);this.minDate.setHours(0);if(isNaN(this.minDate)){this.minDate=new Date("1/1/1900")}b=b&&(this.fullDate>=this.minDate)}if(this.maxDate){this.maxDate=new Date(this.maxDate);this.minDate.setHours(0);if(isNaN(this.maxDate)){this.maxDate=new Date()}b=b&&(this.fullDate<=this.maxDate)}if(this.maxDate&&this.minDate){this.validateDataErrorText="Please enter a valid date between %s and %s"}else{if(this.maxDate){this.validateDataErrorText="Please enter a valid date less than or equal to %s"}else{if(this.minDate){this.validateDataErrorText="Please enter a valid date equal to or greater than %s"}else{this.validateDataErrorText=""}}}}return b},validateDataErrorText:"Date should be between %s and %s",errorTextModifier:function(b){if(this.minDate){b=b.sub("%s",this.dateFormat(this.minDate))}if(this.maxDate){b=b.sub("%s",this.dateFormat(this.maxDate))}return b},dateFormat:function(b){return(b.getMonth()+1)+"/"+b.getDate()+"/"+b.getFullYear()}});Varien.FileElement=Class.create();Varien.FileElement.prototype={initialize:function(b){this.fileElement=$(b);this.hiddenElement=$(b+"_value");this.fileElement.observe("change",this.selectFile.bind(this))},selectFile:function(b){this.hiddenElement.value=this.fileElement.getValue()}};Validation.addAllThese([["validate-custom"," ",function(b,d){return d.validate()}]]);Element.addMethods({getInnerText:function(b){b=$(b);if(b.innerText&&!Prototype.Browser.Opera){return b.innerText}return b.innerHTML.stripScripts().unescapeHTML().replace(/[\n\r\s]+/g," ").strip()}});function fireEvent(d,e){if(document.createEvent){var b=document.createEvent("HTMLEvents");b.initEvent(e,true,true);return d.dispatchEvent(b)}else{var b=document.createEventObject();return d.fireEvent("on"+e,b)}}function modulo(b,f){var e=f/10000;var d=b%f;if(Math.abs(d-f)<e||Math.abs(d)<e){d=0}return d}if((typeof Range!="undefined")&&!Range.prototype.createContextualFragment){Range.prototype.createContextualFragment=function(b){var e=document.createDocumentFragment(),d=document.createElement("div");e.appendChild(d);d.outerHTML=b;return e}}var byteConvert=function(b){if(isNaN(b)){return""}var d=["bytes","KB","MB","GB","TB","PB","EB","ZB","YB"];var f=Math.floor(Math.log(b)/Math.log(2));if(f<1){f=0}var e=Math.floor(f/10);b=b/Math.pow(2,10*e);if(b.toString().length>b.toFixed(2).toString().length){b=b.toFixed(2)}return b+" "+d[e]};var SessionError=Class.create();SessionError.prototype={initialize:function(b){this.errorText=b},toString:function(){return"Session Error:"+this.errorText}};Ajax.Request.addMethods({initialize:function($super,d,b){$super(b);this.transport=Ajax.getTransport();if(!d.match(new RegExp("[?&]isAjax=true",""))){d=d.match(new RegExp("\\?","g"))?d+"&isAjax=true":d+"?isAjax=true"}if(Object.isString(this.options.parameters)&&this.options.parameters.indexOf("form_key=")==-1){this.options.parameters+="&"+Object.toQueryString({form_key:FORM_KEY})}else{if(!this.options.parameters){this.options.parameters={form_key:FORM_KEY}}if(!this.options.parameters.form_key){this.options.parameters.form_key=FORM_KEY}}this.request(d)},respondToReadyState:function(b){var g=Ajax.Request.Events[b],d=new Ajax.Response(this);if(g=="Complete"){try{this._complete=true;if(d.responseText.isJSON()){var f=d.responseText.evalJSON();if(f.ajaxExpired&&f.ajaxRedirect){window.location.replace(f.ajaxRedirect);throw new SessionError("session expired")}}(this.options["on"+d.status]||this.options["on"+(this.success()?"Success":"Failure")]||Prototype.emptyFunction)(d,d.headerJSON)}catch(h){this.dispatchException(h);if(h instanceof SessionError){return}}var l=d.getHeader("Content-type");if(this.options.evalJS=="force"||(this.options.evalJS&&this.isSameOrigin()&&l&&l.match(/^\s*(text|application)\/(x-)?(java|ecma)script(;.*)?\s*$/i))){this.evalResponse()}}try{(this.options["on"+g]||Prototype.emptyFunction)(d,d.headerJSON);Ajax.Responders.dispatch("on"+g,this,d,d.headerJSON)}catch(h){this.dispatchException(h)}if(g=="Complete"){this.transport.onreadystatechange=Prototype.emptyFunction}}});Ajax.Updater.respondToReadyState=Ajax.Request.respondToReadyState;var varienLoader=new Class.create();varienLoader.prototype={initialize:function(b){this.callback=false;this.cache=$H();this.caching=b||false;this.url=false},getCache:function(b){if(this.cache.get(b)){return this.cache.get(b)}return false},load:function(b,d,f){this.url=b;this.callback=f;if(this.caching){var e=this.getCache(b);if(e){this.processResult(e);return}}if(typeof(d.updaterId)!="undefined"){new varienUpdater(d.updaterId,b,{evalScripts:true,onComplete:this.processResult.bind(this),onFailure:this._processFailure.bind(this)})}else{new Ajax.Request(b,{method:"post",parameters:d||{},onComplete:this.processResult.bind(this),onFailure:this._processFailure.bind(this)})}},_processFailure:function(b){location.href=BASE_URL},processResult:function(b){if(this.caching){this.cache.set(this.url,b)}if(this.callback){this.callback(b.responseText)}}};if(!window.varienLoaderHandler){var varienLoaderHandler=new Object()}varienLoaderHandler.handler={onCreate:function(b){if(b.options.loaderArea===false){return}jQuery("body").trigger("processStart")},onException:function(b){jQuery("body").trigger("processStop")},onComplete:function(b){jQuery("body").trigger("processStop")}};function setLoaderPosition(){var e=$("loading_mask_loader");if(e&&Prototype.Browser.IE){var d=e.getDimensions();var f=document.viewport.getDimensions();var b=document.viewport.getScrollOffsets();e.style.left=Math.floor(f.width/2+b.left-d.width/2)+"px";e.style.top=Math.floor(f.height/2+b.top-d.height/2)+"px";e.style.position="absolute"}}function toggleSelectsUnderBlock(f,b){if(Prototype.Browser.IE){var e=document.getElementsByTagName("select");for(var d=0;d<e.length;d++){if(b){if(e[d].needShowOnSuccess){e[d].needShowOnSuccess=false;e[d].style.visibility=""}}else{if(Element.visible(e[d])){e[d].style.visibility="hidden";e[d].needShowOnSuccess=true}}}}}Ajax.Responders.register(varienLoaderHandler.handler);var varienUpdater=Class.create(Ajax.Updater,{updateContent:function($super,b){if(b.isJSON()){var d=b.evalJSON();if(d.ajaxExpired&&d.ajaxRedirect){window.location.replace(d.ajaxRedirect)}}else{$super(b)}}});function setLocation(b){window.location.href=b}function setElementDisable(d,b){if($(d)){$(d).disabled=b}}function toggleParentVis(b){b=$(b).parentNode;if(b.style.display=="none"){b.style.display=""}else{b.style.display="none"}}function toggleFieldsetVis(d){id=d;d=$(d);if(d.style.display=="none"){d.style.display=""}else{d.style.display="none"}d=d.parentNode.childElements();for(var b=0;b<d.length;b++){if(d[b].id!=undefined&&d[b].id==id&&d[(b-1)].classNames()=="entry-edit-head"){if(d[b-1].style.display=="none"){d[b-1].style.display=""}else{d[b-1].style.display="none"}}}}function toggleVis(b){b=$(b);if(b.style.display=="none"){b.style.display=""}else{b.style.display="none"}}function imagePreview(b){if($(b)){var d=window.open("","preview","width=400,height=400,resizable=1,scrollbars=1");d.document.open();d.document.write('<body style="padding:0;margin:0"><img src="'+$(b).src+'" id="image_preview"/></body>');d.document.close();Event.observe(d,"load",function(){var e=d.document.getElementById("image_preview");d.resizeTo(e.width+40,e.height+80)})}}function checkByProductPriceType(b){if(b.id=="price_type"){this.productPriceType=b.value;return false}else{if(b.id=="price"&&this.productPriceType==0){return false}return true}}Event.observe(window,"load",function(){if($("price_default")&&$("price_default").checked){$("price").disabled="disabled"}});function toggleSeveralValueElements(f,e,b,d){if(e&&f){if(Object.prototype.toString.call(e)!="[object Array]"){e=[e]}e.each(function(g){toggleValueElements(f,g,b,d)})}}function toggleValueElements(l,d,f,h){if(d&&l){var n=[l];if(typeof f!="undefined"){if(Object.prototype.toString.call(f)!="[object Array]"){f=[f]}for(var g=0;g<f.length;g++){n.push(f[g])}}var e=Element.select(d,["select","input","textarea","button","img"]).filter(function(o){return(o.readAttribute("type")!="hidden")});var b=(h!=undefined?h:l.checked);e.each(function(p){if(checkByProductPriceType(p)){var o=n.length;while(o--&&p!=n[o]){}if(o!=-1){return}p.disabled=b;if(b){p.addClassName("disabled")}else{p.removeClassName("disabled")}if(p.nodeName.toLowerCase()=="img"){b?p.hide():p.show()}}})}}function submitAndReloadArea(e,d){if($(e)){var b=$(e).select("input","select","textarea");var f=Form.serializeElements(b,true);d=d+(d.match(new RegExp("\\?"))?"&isAjax=true":"?isAjax=true");new Ajax.Request(d,{parameters:$H(f),loaderArea:e,onSuccess:function(l){try{if(l.responseText.isJSON()){var g=l.responseText.evalJSON();if(g.error){alert(g.message)}if(g.ajaxExpired&&g.ajaxRedirect){setLocation(g.ajaxRedirect)}}else{$(e).update(l.responseText)}}catch(h){$(e).update(l.responseText)}}})}}function syncOnchangeValue(d,e){var b={baseElem:d,distElem:e};Event.observe(d,"change",function(){if($(this.baseElem)&&$(this.distElem)){$(this.distElem).value=$(this.baseElem).value}}.bind(b))}function updateElementAtCursor(e,f,g){if(g==undefined){g=window.self}if(document.selection){e.focus();sel=g.document.selection.createRange();sel.text=f}else{if(e.selectionStart||e.selectionStart=="0"){var d=e.selectionStart;var b=e.selectionEnd;e.value=e.value.substring(0,d)+f+e.value.substring(b,e.value.length)}else{e.value+=f}}}function firebugEnabled(){if(window.console&&window.console.firebug){return true}return false}function disableElement(b){b.disabled=true;b.addClassName("disabled")}function enableElement(b){b.disabled=false;b.removeClassName("disabled")}function disableElements(b){$$("."+b).each(disableElement)}function enableElements(b){$$("."+b).each(enableElement)}var Cookie={all:function(){var d=document.cookie.split(";");var b={};d.each(function(f,e){var g=f.strip().split("=");b[unescape(g[0])]=unescape(g[1])});return b},read:function(d){var b=this.all();if(b[d]){return b[d]}return null},write:function(h,f,g){var b="";if(g){var e=new Date();e.setTime(e.getTime()+(g*1000));b="; expires="+e.toUTCString()}var d="/"+BASE_URL.split("/").slice(3).join("/");document.cookie=escape(h)+"="+escape(f)+b+"; path="+d},clear:function(b){this.write(b,"",-1)}};var Fieldset={cookiePrefix:"fh-",applyCollapse:function(b){if($(b+"-state")){collapsed=$(b+"-state").value==1?0:1}else{collapsed=$(b+"-head").collapsed}if(collapsed==1||collapsed===undefined){$(b+"-head").removeClassName("open");if($(b+"-head").up(".section-config")){$(b+"-head").up(".section-config").removeClassName("active")}$(b).hide()}else{$(b+"-head").addClassName("open");if($(b+"-head").up(".section-config")){$(b+"-head").up(".section-config").addClassName("active")}$(b).show()}},toggleCollapse:function(b,d){if($(b+"-state")){collapsed=$(b+"-state").value==1?0:1}else{collapsed=$(b+"-head").collapsed}if(collapsed==1||collapsed===undefined){if($(b+"-state")){$(b+"-state").value=1}$(b+"-head").collapsed=0}else{if($(b+"-state")){$(b+"-state").value=0}$(b+"-head").collapsed=1}this.applyCollapse(b);if(typeof d!="undefined"){this.saveState(d,{container:b,value:$(b+"-state").value})}},addToPrefix:function(b){this.cookiePrefix+=b+"-"},saveState:function(b,d){new Ajax.Request(b,{method:"get",parameters:Object.toQueryString(d),loaderArea:false})}};var Base64={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(e){var b="";var p,n,h,o,l,g,f;var d=0;e=Base64._utf8_encode(e);if(typeof window.btoa==="function"){return window.btoa(e)}while(d<e.length){p=e.charCodeAt(d++);n=e.charCodeAt(d++);h=e.charCodeAt(d++);o=p>>2;l=((p&3)<<4)|(n>>4);g=((n&15)<<2)|(h>>6);f=h&63;if(isNaN(n)){g=f=64}else{if(isNaN(h)){f=64}}b=b+this._keyStr.charAt(o)+this._keyStr.charAt(l)+this._keyStr.charAt(g)+this._keyStr.charAt(f)}return b},decode:function(e){var b="";var p,n,h;var o,l,g,f;var d=0;if(typeof window.atob==="function"){return Base64._utf8_decode(window.atob(e))}e=e.replace(/[^A-Za-z0-9\+\/\=]/g,"");while(d<e.length){o=this._keyStr.indexOf(e.charAt(d++));l=this._keyStr.indexOf(e.charAt(d++));g=this._keyStr.indexOf(e.charAt(d++));f=this._keyStr.indexOf(e.charAt(d++));p=(o<<2)|(l>>4);n=((l&15)<<4)|(g>>2);h=((g&3)<<6)|f;b=b+String.fromCharCode(p);if(g!=64){b=b+String.fromCharCode(n)}if(f!=64){b=b+String.fromCharCode(h)}}return Base64._utf8_decode(b)},mageEncode:function(b){return this.encode(b).replace(/\+/g,"-").replace(/\//g,"_").replace(/=/g,",")},mageDecode:function(b){b=b.replace(/\-/g,"+").replace(/_/g,"/").replace(/,/g,"=");return this.decode(b)},idEncode:function(b){return this.encode(b).replace(/\+/g,":").replace(/\//g,"_").replace(/=/g,"-")},idDecode:function(b){b=b.replace(/\-/g,"=").replace(/_/g,"/").replace(/\:/g,"+");return this.decode(b)},_utf8_encode:function(d){d=d.replace(/\r\n/g,"\n");var b="";for(var f=0;f<d.length;f++){var e=d.charCodeAt(f);if(e<128){b+=String.fromCharCode(e)}else{if((e>127)&&(e<2048)){b+=String.fromCharCode((e>>6)|192);b+=String.fromCharCode((e&63)|128)}else{b+=String.fromCharCode((e>>12)|224);b+=String.fromCharCode(((e>>6)&63)|128);b+=String.fromCharCode((e&63)|128)}}}return b},_utf8_decode:function(b){var d="";var e=0;var f=c1=c2=0;while(e<b.length){f=b.charCodeAt(e);if(f<128){d+=String.fromCharCode(f);e++}else{if((f>191)&&(f<224)){c2=b.charCodeAt(e+1);d+=String.fromCharCode(((f&31)<<6)|(c2&63));e+=2}else{c2=b.charCodeAt(e+1);c3=b.charCodeAt(e+2);d+=String.fromCharCode(((f&15)<<12)|((c2&63)<<6)|(c3&63));e+=3}}}return d}};function sortNumeric(d,b){return d-b}(function(){var globals=["Prototype","Abstract","Try","Class","PeriodicalExecuter","Template","$break","Enumerable","$A","$w","$H","Hash","$R","ObjectRange","Ajax","$","Form","Field","$F","Toggle","Insertion","$continue","Position","Windows","Dialog","array","WindowUtilities","Builder","Effect","validateCreditCard","Validator","Validation","removeDelimiters","parseNumber","popWin","setLocation","setPLocation","setLanguageCode","decorateGeneric","decorateTable","decorateList","decorateDataList","parseSidUrl","formatCurrency","expandDetails","isIE","Varien","fireEvent","modulo","byteConvert","SessionError","varienLoader","varienLoaderHandler","setLoaderPosition","toggleSelectsUnderBlock","varienUpdater","setElementDisable","toggleParentVis","toggleFieldsetVis","toggleVis","imagePreview","checkByProductPriceType","toggleSeveralValueElements","toggleValueElements","submitAndReloadArea","syncOnchangeValue","updateElementAtCursor","firebugEnabled","disableElement","enableElement","disableElements","enableElements","Cookie","Fieldset","Base64","sortNumeric","Element","$$","Sizzle","Selector","Window"];globals.forEach(function(prop){window[prop]=eval(prop)})})();
\ No newline at end of file
+(function(){var w=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,p=0,g=Object.prototype.toString,u=false,o=true;[0,0].sort(function(){o=false;return 0});var d=function(L,B,I,D){I=I||[];var e=B=B||document;if(B.nodeType!==1&&B.nodeType!==9){return[]}if(!L||typeof L!=="string"){return I}var J=[],K,G,P,O,H,A,z=true,E=v(B),N=L;while((w.exec(""),K=w.exec(N))!==null){N=K[3];J.push(K[1]);if(K[2]){A=K[3];break}}if(J.length>1&&q.exec(L)){if(J.length===2&&h.relative[J[0]]){G=l(J[0]+J[1],B)}else{G=h.relative[J[0]]?[B]:d(J.shift(),B);while(J.length){L=J.shift();if(h.relative[L]){L+=J.shift()}G=l(L,G)}}}else{if(!D&&J.length>1&&B.nodeType===9&&!E&&h.match.ID.test(J[0])&&!h.match.ID.test(J[J.length-1])){var Q=d.find(J.shift(),B,E);B=Q.expr?d.filter(Q.expr,Q.set)[0]:Q.set[0]}if(B){var Q=D?{expr:J.pop(),set:b(D)}:d.find(J.pop(),J.length===1&&(J[0]==="~"||J[0]==="+")&&B.parentNode?B.parentNode:B,E);G=Q.expr?d.filter(Q.expr,Q.set):Q.set;if(J.length>0){P=b(G)}else{z=false}while(J.length){var C=J.pop(),F=C;if(!h.relative[C]){C=""}else{F=J.pop()}if(F==null){F=B}h.relative[C](P,F,E)}}else{P=J=[]}}if(!P){P=G}if(!P){throw"Syntax error, unrecognized expression: "+(C||L)}if(g.call(P)==="[object Array]"){if(!z){I.push.apply(I,P)}else{if(B&&B.nodeType===1){for(var M=0;P[M]!=null;M++){if(P[M]&&(P[M]===true||P[M].nodeType===1&&n(B,P[M]))){I.push(G[M])}}}else{for(var M=0;P[M]!=null;M++){if(P[M]&&P[M].nodeType===1){I.push(G[M])}}}}}else{b(P,I)}if(A){d(A,e,I,D);d.uniqueSort(I)}return I};d.uniqueSort=function(z){if(f){u=o;z.sort(f);if(u){for(var e=1;e<z.length;e++){if(z[e]===z[e-1]){z.splice(e--,1)}}}}return z};d.matches=function(e,z){return d(e,null,null,z)};d.find=function(F,e,G){var E,C;if(!F){return[]}for(var B=0,A=h.order.length;B<A;B++){var D=h.order[B],C;if((C=h.leftMatch[D].exec(F))){var z=C[1];C.splice(1,1);if(z.substr(z.length-1)!=="\\"){C[1]=(C[1]||"").replace(/\\/g,"");E=h.find[D](C,e,G);if(E!=null){F=F.replace(h.match[D],"");break}}}}if(!E){E=e.getElementsByTagName("*")}return{set:E,expr:F}};d.filter=function(I,H,L,B){var A=I,N=[],F=H,D,e,E=H&&H[0]&&v(H[0]);while(I&&H.length){for(var G in h.filter){if((D=h.match[G].exec(I))!=null){var z=h.filter[G],M,K;e=false;if(F==N){N=[]}if(h.preFilter[G]){D=h.preFilter[G](D,F,L,N,B,E);if(!D){e=M=true}else{if(D===true){continue}}}if(D){for(var C=0;(K=F[C])!=null;C++){if(K){M=z(K,D,C,F);var J=B^!!M;if(L&&M!=null){if(J){e=true}else{F[C]=false}}else{if(J){N.push(K);e=true}}}}}if(M!==undefined){if(!L){F=N}I=I.replace(h.match[G],"");if(!e){return[]}break}}}if(I==A){if(e==null){throw"Syntax error, unrecognized expression: "+I}else{break}}A=I}return F};var h=d.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(e){return e.getAttribute("href")}},relative:{"+":function(F,e,E){var C=typeof e==="string",G=C&&!/\W/.test(e),D=C&&!G;if(G&&!E){e=e.toUpperCase()}for(var B=0,A=F.length,z;B<A;B++){if((z=F[B])){while((z=z.previousSibling)&&z.nodeType!==1){}F[B]=D||z&&z.nodeName===e?z||false:z===e}}if(D){d.filter(e,F,true)}},">":function(E,z,F){var C=typeof z==="string";if(C&&!/\W/.test(z)){z=F?z:z.toUpperCase();for(var A=0,e=E.length;A<e;A++){var D=E[A];if(D){var B=D.parentNode;E[A]=B.nodeName===z?B:false}}}else{for(var A=0,e=E.length;A<e;A++){var D=E[A];if(D){E[A]=C?D.parentNode:D.parentNode===z}}if(C){d.filter(z,E,true)}}},"":function(B,z,D){var A=p++,e=y;if(!/\W/.test(z)){var C=z=D?z:z.toUpperCase();e=t}e("parentNode",z,A,B,C,D)},"~":function(B,z,D){var A=p++,e=y;if(typeof z==="string"&&!/\W/.test(z)){var C=z=D?z:z.toUpperCase();e=t}e("previousSibling",z,A,B,C,D)}},find:{ID:function(z,A,B){if(typeof A.getElementById!=="undefined"&&!B){var e=A.getElementById(z[1]);return e?[e]:[]}},NAME:function(A,D,E){if(typeof D.getElementsByName!=="undefined"){var z=[],C=D.getElementsByName(A[1]);for(var B=0,e=C.length;B<e;B++){if(C[B].getAttribute("name")===A[1]){z.push(C[B])}}return z.length===0?null:z}},TAG:function(e,z){return z.getElementsByTagName(e[1])}},preFilter:{CLASS:function(B,z,A,e,E,F){B=" "+B[1].replace(/\\/g,"")+" ";if(F){return B}for(var C=0,D;(D=z[C])!=null;C++){if(D){if(E^(D.className&&(" "+D.className+" ").indexOf(B)>=0)){if(!A){e.push(D)}}else{if(A){z[C]=false}}}}return false},ID:function(e){return e[1].replace(/\\/g,"")},TAG:function(z,e){for(var A=0;e[A]===false;A++){}return e[A]&&v(e[A])?z[1]:z[1].toUpperCase()},CHILD:function(e){if(e[1]=="nth"){var z=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(e[2]=="even"&&"2n"||e[2]=="odd"&&"2n+1"||!/\D/.test(e[2])&&"0n+"+e[2]||e[2]);e[2]=(z[1]+(z[2]||1))-0;e[3]=z[3]-0}e[0]=p++;return e},ATTR:function(C,z,A,e,D,E){var B=C[1].replace(/\\/g,"");if(!E&&h.attrMap[B]){C[1]=h.attrMap[B]}if(C[2]==="~="){C[4]=" "+C[4]+" "}return C},PSEUDO:function(C,z,A,e,D){if(C[1]==="not"){if((w.exec(C[3])||"").length>1||/^\w/.test(C[3])){C[3]=d(C[3],null,null,z)}else{var B=d.filter(C[3],z,A,true^D);if(!A){e.push.apply(e,B)}return false}}else{if(h.match.POS.test(C[0])||h.match.CHILD.test(C[0])){return true}}return C},POS:function(e){e.unshift(true);return e}},filters:{enabled:function(e){return e.disabled===false&&e.type!=="hidden"},disabled:function(e){return e.disabled===true},checked:function(e){return e.checked===true},selected:function(e){e.parentNode.selectedIndex;return e.selected===true},parent:function(e){return !!e.firstChild},empty:function(e){return !e.firstChild},has:function(A,z,e){return !!d(e[3],A).length},header:function(e){return/h\d/i.test(e.nodeName)},text:function(e){return"text"===e.type},radio:function(e){return"radio"===e.type},checkbox:function(e){return"checkbox"===e.type},file:function(e){return"file"===e.type},password:function(e){return"password"===e.type},submit:function(e){return"submit"===e.type},image:function(e){return"image"===e.type},reset:function(e){return"reset"===e.type},button:function(e){return"button"===e.type||e.nodeName.toUpperCase()==="BUTTON"},input:function(e){return/input|select|textarea|button/i.test(e.nodeName)}},setFilters:{first:function(z,e){return e===0},last:function(A,z,e,B){return z===B.length-1},even:function(z,e){return e%2===0},odd:function(z,e){return e%2===1},lt:function(A,z,e){return z<e[3]-0},gt:function(A,z,e){return z>e[3]-0},nth:function(A,z,e){return e[3]-0==z},eq:function(A,z,e){return e[3]-0==z}},filter:{PSEUDO:function(E,A,B,F){var z=A[1],C=h.filters[z];if(C){return C(E,B,A,F)}else{if(z==="contains"){return(E.textContent||E.innerText||"").indexOf(A[3])>=0}else{if(z==="not"){var D=A[3];for(var B=0,e=D.length;B<e;B++){if(D[B]===E){return false}}return true}}}},CHILD:function(e,B){var E=B[1],z=e;switch(E){case"only":case"first":while((z=z.previousSibling)){if(z.nodeType===1){return false}}if(E=="first"){return true}z=e;case"last":while((z=z.nextSibling)){if(z.nodeType===1){return false}}return true;case"nth":var A=B[2],H=B[3];if(A==1&&H==0){return true}var D=B[0],G=e.parentNode;if(G&&(G.sizcache!==D||!e.nodeIndex)){var C=0;for(z=G.firstChild;z;z=z.nextSibling){if(z.nodeType===1){z.nodeIndex=++C}}G.sizcache=D}var F=e.nodeIndex-H;if(A==0){return F==0}else{return(F%A==0&&F/A>=0)}}},ID:function(z,e){return z.nodeType===1&&z.getAttribute("id")===e},TAG:function(z,e){return(e==="*"&&z.nodeType===1)||z.nodeName===e},CLASS:function(z,e){return(" "+(z.className||z.getAttribute("class"))+" ").indexOf(e)>-1},ATTR:function(D,B){var A=B[1],e=h.attrHandle[A]?h.attrHandle[A](D):D[A]!=null?D[A]:D.getAttribute(A),E=e+"",C=B[2],z=B[4];return e==null?C==="!=":C==="="?E===z:C==="*="?E.indexOf(z)>=0:C==="~="?(" "+E+" ").indexOf(z)>=0:!z?E&&e!==false:C==="!="?E!=z:C==="^="?E.indexOf(z)===0:C==="$="?E.substr(E.length-z.length)===z:C==="|="?E===z||E.substr(0,z.length+1)===z+"-":false},POS:function(C,z,A,D){var e=z[2],B=h.setFilters[e];if(B){return B(C,A,z,D)}}}};var q=h.match.POS;for(var s in h.match){h.match[s]=new RegExp(h.match[s].source+/(?![^\[]*\])(?![^\(]*\))/.source);h.leftMatch[s]=new RegExp(/(^(?:.|\r|\n)*?)/.source+h.match[s].source)}var b=function(z,e){z=Array.prototype.slice.call(z,0);if(e){e.push.apply(e,z);return e}return z};try{Array.prototype.slice.call(document.documentElement.childNodes,0)}catch(r){b=function(C,B){var z=B||[];if(g.call(C)==="[object Array]"){Array.prototype.push.apply(z,C)}else{if(typeof C.length==="number"){for(var A=0,e=C.length;A<e;A++){z.push(C[A])}}else{for(var A=0;C[A];A++){z.push(C[A])}}}return z}}var f;if(document.documentElement.compareDocumentPosition){f=function(z,e){if(!z.compareDocumentPosition||!e.compareDocumentPosition){if(z==e){u=true}return 0}var A=z.compareDocumentPosition(e)&4?-1:z===e?0:1;if(A===0){u=true}return A}}else{if("sourceIndex" in document.documentElement){f=function(z,e){if(!z.sourceIndex||!e.sourceIndex){if(z==e){u=true}return 0}var A=z.sourceIndex-e.sourceIndex;if(A===0){u=true}return A}}else{if(document.createRange){f=function(B,z){if(!B.ownerDocument||!z.ownerDocument){if(B==z){u=true}return 0}var A=B.ownerDocument.createRange(),e=z.ownerDocument.createRange();A.setStart(B,0);A.setEnd(B,0);e.setStart(z,0);e.setEnd(z,0);var C=A.compareBoundaryPoints(Range.START_TO_END,e);if(C===0){u=true}return C}}}}(function(){var z=document.createElement("div"),A="script"+(new Date).getTime();z.innerHTML="<a name='"+A+"'/>";var e=document.documentElement;e.insertBefore(z,e.firstChild);if(!!document.getElementById(A)){h.find.ID=function(C,D,E){if(typeof D.getElementById!=="undefined"&&!E){var B=D.getElementById(C[1]);return B?B.id===C[1]||typeof B.getAttributeNode!=="undefined"&&B.getAttributeNode("id").nodeValue===C[1]?[B]:undefined:[]}};h.filter.ID=function(D,B){var C=typeof D.getAttributeNode!=="undefined"&&D.getAttributeNode("id");return D.nodeType===1&&C&&C.nodeValue===B}}e.removeChild(z);e=z=null})();(function(){var e=document.createElement("div");e.appendChild(document.createComment(""));if(e.getElementsByTagName("*").length>0){h.find.TAG=function(z,D){var C=D.getElementsByTagName(z[1]);if(z[1]==="*"){var B=[];for(var A=0;C[A];A++){if(C[A].nodeType===1){B.push(C[A])}}C=B}return C}}e.innerHTML="<a href='#'></a>";if(e.firstChild&&typeof e.firstChild.getAttribute!=="undefined"&&e.firstChild.getAttribute("href")!=="#"){h.attrHandle.href=function(z){return z.getAttribute("href",2)}}e=null})();if(document.querySelectorAll){(function(){var e=d,A=document.createElement("div");A.innerHTML="<p class='TEST'></p>";if(A.querySelectorAll&&A.querySelectorAll(".TEST").length===0){return}d=function(E,D,B,C){D=D||document;if(!C&&D.nodeType===9&&!v(D)){try{return b(D.querySelectorAll(E),B)}catch(F){}}return e(E,D,B,C)};for(var z in e){d[z]=e[z]}A=null})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var e=document.createElement("div");e.innerHTML="<div class='test e'></div><div class='test'></div>";if(e.getElementsByClassName("e").length===0){return}e.lastChild.className="e";if(e.getElementsByClassName("e").length===1){return}h.order.splice(1,0,"CLASS");h.find.CLASS=function(z,A,B){if(typeof A.getElementsByClassName!=="undefined"&&!B){return A.getElementsByClassName(z[1])}};e=null})()}function t(z,E,D,I,F,H){var G=z=="previousSibling"&&!H;for(var B=0,A=I.length;B<A;B++){var e=I[B];if(e){if(G&&e.nodeType===1){e.sizcache=D;e.sizset=B}e=e[z];var C=false;while(e){if(e.sizcache===D){C=I[e.sizset];break}if(e.nodeType===1&&!H){e.sizcache=D;e.sizset=B}if(e.nodeName===E){C=e;break}e=e[z]}I[B]=C}}}function y(z,E,D,I,F,H){var G=z=="previousSibling"&&!H;for(var B=0,A=I.length;B<A;B++){var e=I[B];if(e){if(G&&e.nodeType===1){e.sizcache=D;e.sizset=B}e=e[z];var C=false;while(e){if(e.sizcache===D){C=I[e.sizset];break}if(e.nodeType===1){if(!H){e.sizcache=D;e.sizset=B}if(typeof E!=="string"){if(e===E){C=true;break}}else{if(d.filter(E,[e]).length>0){C=e;break}}}e=e[z]}I[B]=C}}}var n=document.compareDocumentPosition?function(z,e){return z.compareDocumentPosition(e)&16}:function(z,e){return z!==e&&(z.contains?z.contains(e):true)};var v=function(e){return e.nodeType===9&&e.documentElement.nodeName!=="HTML"||!!e.ownerDocument&&e.ownerDocument.documentElement.nodeName!=="HTML"};var l=function(e,F){var B=[],C="",D,A=F.nodeType?[F]:F;while((D=h.match.PSEUDO.exec(e))){C+=D[0];e=e.replace(h.match.PSEUDO,"")}e=h.relative[e]?e+"*":e;for(var E=0,z=A.length;E<z;E++){d(e,A[E],B)}return d.filter(C,B)};window.Sizzle=d})();(function(e){var f=Prototype.Selector.extendElements;function b(g,h){return f(e(g,h||document))}function d(h,g){return e.matches(g,[h]).length==1}Prototype.Selector.engine=e;Prototype.Selector.select=b;Prototype.Selector.match=d})(Sizzle);window.Sizzle=Prototype._original_property;delete Prototype._original_property;var Form={reset:function(b){b=$(b);b.reset();return b},serializeElements:function(n,f){if(typeof f!="object"){f={hash:!!f}}else{if(Object.isUndefined(f.hash)){f.hash=true}}var g,l,b=false,h=f.submit,d,e;if(f.hash){e={};d=function(o,p,q){if(p in o){if(!Object.isArray(o[p])){o[p]=[o[p]]}o[p].push(q)}else{o[p]=q}return o}}else{e="";d=function(o,p,q){return o+(o?"&":"")+encodeURIComponent(p)+"="+encodeURIComponent(q)}}return n.inject(e,function(o,p){if(!p.disabled&&p.name){g=p.name;l=$(p).getValue();if(l!=null&&p.type!="file"&&(p.type!="submit"||(!b&&h!==false&&(!h||g==h)&&(b=true)))){o=d(o,g,l)}}return o})}};Form.Methods={serialize:function(d,b){return Form.serializeElements(Form.getElements(d),b)},getElements:function(g){var h=$(g).getElementsByTagName("*"),f,b=[],e=Form.Element.Serializers;for(var d=0;f=h[d];d++){b.push(f)}return b.inject([],function(l,n){if(e[n.tagName.toLowerCase()]){l.push(Element.extend(n))}return l})},getInputs:function(l,e,f){l=$(l);var b=l.getElementsByTagName("input");if(!e&&!f){return $A(b).map(Element.extend)}for(var g=0,n=[],h=b.length;g<h;g++){var d=b[g];if((e&&d.type!=e)||(f&&d.name!=f)){continue}n.push(Element.extend(d))}return n},disable:function(b){b=$(b);Form.getElements(b).invoke("disable");return b},enable:function(b){b=$(b);Form.getElements(b).invoke("enable");return b},findFirstElement:function(d){var e=$(d).getElements().findAll(function(f){return"hidden"!=f.type&&!f.disabled});var b=e.findAll(function(f){return f.hasAttribute("tabIndex")&&f.tabIndex>=0}).sortBy(function(f){return f.tabIndex}).first();return b?b:e.find(function(f){return/^(?:input|select|textarea)$/i.test(f.tagName)})},focusFirstElement:function(d){d=$(d);var b=d.findFirstElement();if(b){b.activate()}return d},request:function(d,b){d=$(d),b=Object.clone(b||{});var f=b.parameters,e=d.readAttribute("action")||"";if(e.blank()){e=window.location.href}b.parameters=d.serialize(true);if(f){if(Object.isString(f)){f=f.toQueryParams()}Object.extend(b.parameters,f)}if(d.hasAttribute("method")&&!b.method){b.method=d.method}return new Ajax.Request(e,b)}};Form.Element={focus:function(b){$(b).focus();return b},select:function(b){$(b).select();return b}};Form.Element.Methods={serialize:function(b){b=$(b);if(!b.disabled&&b.name){var d=b.getValue();if(d!=undefined){var e={};e[b.name]=d;return Object.toQueryString(e)}}return""},getValue:function(b){b=$(b);var d=b.tagName.toLowerCase();return Form.Element.Serializers[d](b)},setValue:function(b,d){b=$(b);var e=b.tagName.toLowerCase();Form.Element.Serializers[e](b,d);return b},clear:function(b){$(b).value="";return b},present:function(b){return $(b).value!=""},activate:function(b){b=$(b);try{b.focus();if(b.select&&(b.tagName.toLowerCase()!="input"||!(/^(?:button|reset|submit)$/i.test(b.type)))){b.select()}}catch(d){}return b},disable:function(b){b=$(b);b.disabled=true;return b},enable:function(b){b=$(b);b.disabled=false;return b}};var Field=Form.Element;var $F=Form.Element.Methods.getValue;Form.Element.Serializers=(function(){function d(n,o){switch(n.type.toLowerCase()){case"checkbox":case"radio":return h(n,o);default:return g(n,o)}}function h(n,o){if(Object.isUndefined(o)){return n.checked?n.value:null}else{n.checked=!!o}}function g(n,o){if(Object.isUndefined(o)){return n.value}else{n.value=o}}function b(p,s){if(Object.isUndefined(s)){return(p.type==="select-one"?e:f)(p)}var o,q,t=!Object.isArray(s);for(var n=0,r=p.length;n<r;n++){o=p.options[n];q=this.optionValue(o);if(t){if(q==s){o.selected=true;return}}else{o.selected=s.include(q)}}}function e(o){var n=o.selectedIndex;return n>=0?l(o.options[n]):null}function f(q){var n,r=q.length;if(!r){return null}for(var p=0,n=[];p<r;p++){var o=q.options[p];if(o.selected){n.push(l(o))}}return n}function l(n){return Element.hasAttribute(n,"value")?n.value:n.text}return{input:d,inputSelector:h,textarea:g,select:b,selectOne:e,selectMany:f,optionValue:l,button:g}})();Abstract.TimedObserver=Class.create(PeriodicalExecuter,{initialize:function($super,b,d,e){$super(e,d);this.element=$(b);this.lastValue=this.getValue()},execute:function(){var b=this.getValue();if(Object.isString(this.lastValue)&&Object.isString(b)?this.lastValue!=b:String(this.lastValue)!=String(b)){this.callback(this.element,b);this.lastValue=b}}});Form.Element.Observer=Class.create(Abstract.TimedObserver,{getValue:function(){return Form.Element.getValue(this.element)}});Form.Observer=Class.create(Abstract.TimedObserver,{getValue:function(){return Form.serialize(this.element)}});Abstract.EventObserver=Class.create({initialize:function(b,d){this.element=$(b);this.callback=d;this.lastValue=this.getValue();if(this.element.tagName.toLowerCase()=="form"){this.registerFormCallbacks()}else{this.registerCallback(this.element)}},onElementEvent:function(){var b=this.getValue();if(this.lastValue!=b){this.callback(this.element,b);this.lastValue=b}},registerFormCallbacks:function(){Form.getElements(this.element).each(this.registerCallback,this)},registerCallback:function(b){if(b.type){switch(b.type.toLowerCase()){case"checkbox":case"radio":Event.observe(b,"click",this.onElementEvent.bind(this));break;default:Event.observe(b,"change",this.onElementEvent.bind(this));break}}}});Form.Element.EventObserver=Class.create(Abstract.EventObserver,{getValue:function(){return Form.Element.getValue(this.element)}});Form.EventObserver=Class.create(Abstract.EventObserver,{getValue:function(){return Form.serialize(this.element)}});(function(){var J={KEY_BACKSPACE:8,KEY_TAB:9,KEY_RETURN:13,KEY_ESC:27,KEY_LEFT:37,KEY_UP:38,KEY_RIGHT:39,KEY_DOWN:40,KEY_DELETE:46,KEY_HOME:36,KEY_END:35,KEY_PAGEUP:33,KEY_PAGEDOWN:34,KEY_INSERT:45,cache:{}};var h=document.documentElement;var K="onmouseenter" in h&&"onmouseleave" in h;var b=function(L){return false};if(window.attachEvent){if(window.addEventListener){b=function(L){return !(L instanceof window.Event)}}else{b=function(L){return true}}}var y;function H(M,L){return M.which?(M.which===L+1):(M.button===L)}var u={0:1,1:4,2:2};function F(M,L){return M.button===u[L]}function I(M,L){switch(L){case 0:return M.which==1&&!M.metaKey;case 1:return M.which==2||(M.which==1&&M.metaKey);case 2:return M.which==3;default:return false}}if(window.attachEvent){if(!window.addEventListener){y=F}else{y=function(M,L){return b(M)?F(M,L):H(M,L)}}}else{if(Prototype.Browser.WebKit){y=I}else{y=H}}function C(L){return y(L,0)}function A(L){return y(L,1)}function t(L){return y(L,2)}function f(N){N=J.extend(N);var M=N.target,L=N.type,O=N.currentTarget;if(O&&O.tagName){if(L==="load"||L==="error"||(L==="click"&&O.tagName.toLowerCase()==="input"&&O.type==="radio")){M=O}}if(M.nodeType==Node.TEXT_NODE){M=M.parentNode}return Element.extend(M)}function v(M,N){var L=J.element(M);if(!N){return L}while(L){if(Object.isElement(L)&&Prototype.Selector.match(L,N)){return Element.extend(L)}L=L.parentNode}}function z(L){return{x:e(L),y:d(L)}}function e(N){var M=document.documentElement,L=document.body||{scrollLeft:0};return N.pageX||(N.clientX+(M.scrollLeft||L.scrollLeft)-(M.clientLeft||0))}function d(N){var M=document.documentElement,L=document.body||{scrollTop:0};return N.pageY||(N.clientY+(M.scrollTop||L.scrollTop)-(M.clientTop||0))}function w(L){J.extend(L);L.preventDefault();L.stopPropagation();L.stopped=true}J.Methods={isLeftClick:C,isMiddleClick:A,isRightClick:t,element:f,findElement:v,pointer:z,pointerX:e,pointerY:d,stop:w};var E=Object.keys(J.Methods).inject({},function(L,M){L[M]=J.Methods[M].methodize();return L});if(window.attachEvent){function o(M){var L;switch(M.type){case"mouseover":case"mouseenter":L=M.fromElement;break;case"mouseout":case"mouseleave":L=M.toElement;break;default:return null}return Element.extend(L)}var B={stopPropagation:function(){this.cancelBubble=true},preventDefault:function(){this.returnValue=false},inspect:function(){return"[object Event]"}};J.extend=function(M,L){if(!M){return false}if(!b(M)){return M}if(M._extendedByPrototype){return M}M._extendedByPrototype=Prototype.emptyFunction;var N=J.pointer(M);Object.extend(M,{target:M.srcElement||L,relatedTarget:o(M),pageX:N.x,pageY:N.y});Object.extend(M,E);Object.extend(M,B);return M}}else{J.extend=Prototype.K}if(window.addEventListener){J.prototype=window.Event.prototype||document.createEvent("HTMLEvents").__proto__;Object.extend(J.prototype,E)}function s(P,O,Q){var N=Element.retrieve(P,"prototype_event_registry");if(Object.isUndefined(N)){g.push(P);N=Element.retrieve(P,"prototype_event_registry",$H())}var L=N.get(O);if(Object.isUndefined(L)){L=[];N.set(O,L)}if(L.pluck("handler").include(Q)){return false}var M;if(O.include(":")){M=function(R){if(Object.isUndefined(R.eventName)){return false}if(R.eventName!==O){return false}J.extend(R,P);Q.call(P,R)}}else{if(!K&&(O==="mouseenter"||O==="mouseleave")){if(O==="mouseenter"||O==="mouseleave"){M=function(S){J.extend(S,P);var R=S.relatedTarget;while(R&&R!==P){try{R=R.parentNode}catch(T){R=P}}if(R===P){return}Q.call(P,S)}}}else{M=function(R){J.extend(R,P);Q.call(P,R)}}}M.handler=Q;L.push(M);return M}function n(){for(var L=0,M=g.length;L<M;L++){J.stopObserving(g[L]);g[L]=null}}var g=[];if(Prototype.Browser.IE){window.attachEvent("onunload",n)}if(Prototype.Browser.WebKit){window.addEventListener("unload",Prototype.emptyFunction,false)}var r=Prototype.K,l={mouseenter:"mouseover",mouseleave:"mouseout"};if(!K){r=function(L){return(l[L]||L)}}function D(O,N,P){O=$(O);var M=s(O,N,P);if(!M){return O}if(N.include(":")){if(O.addEventListener){O.addEventListener("dataavailable",M,false)}else{O.attachEvent("ondataavailable",M);O.attachEvent("onlosecapture",M)}}else{var L=r(N);if(O.addEventListener){O.addEventListener(L,M,false)}else{O.attachEvent("on"+L,M)}}return O}function q(R,O,S){R=$(R);var N=Element.retrieve(R,"prototype_event_registry");if(!N){return R}if(!O){N.each(function(U){var T=U.key;q(R,T)});return R}var P=N.get(O);if(!P){return R}if(!S){P.each(function(T){q(R,O,T.handler)});return R}var Q=P.length,M;while(Q--){if(P[Q].handler===S){M=P[Q];break}}if(!M){return R}if(O.include(":")){if(R.removeEventListener){R.removeEventListener("dataavailable",M,false)}else{R.detachEvent("ondataavailable",M);R.detachEvent("onlosecapture",M)}}else{var L=r(O);if(R.removeEventListener){R.removeEventListener(L,M,false)}else{R.detachEvent("on"+L,M)}}N.set(O,P.without(M));return R}function G(O,N,M,L){O=$(O);if(Object.isUndefined(L)){L=true}if(O==document&&document.createEvent&&!O.dispatchEvent){O=document.documentElement}var P;if(document.createEvent){P=document.createEvent("HTMLEvents");P.initEvent("dataavailable",L,true)}else{P=document.createEventObject();P.eventType=L?"ondataavailable":"onlosecapture"}P.eventName=N;P.memo=M||{};if(document.createEvent){O.dispatchEvent(P)}else{O.fireEvent(P.eventType,P)}return J.extend(P)}J.Handler=Class.create({initialize:function(N,M,L,O){this.element=$(N);this.eventName=M;this.selector=L;this.callback=O;this.handler=this.handleEvent.bind(this)},start:function(){J.observe(this.element,this.eventName,this.handler);return this},stop:function(){J.stopObserving(this.element,this.eventName,this.handler);return this},handleEvent:function(M){var L=J.findElement(M,this.selector);if(L){this.callback.call(this.element,M,L)}}});function p(N,M,L,O){N=$(N);if(Object.isFunction(L)&&Object.isUndefined(O)){O=L,L=null}return new J.Handler(N,M,L,O).start()}Object.extend(J,J.Methods);Object.extend(J,{fire:G,observe:D,stopObserving:q,on:p});Element.addMethods({fire:G,observe:D,stopObserving:q,on:p});Object.extend(document,{fire:G.methodize(),observe:D.methodize(),stopObserving:q.methodize(),on:p.methodize(),loaded:false});if(window.Event){Object.extend(window.Event,J)}else{window.Event=J}})();(function(){var e;function b(){if(document.loaded){return}if(e){window.clearTimeout(e)}document.loaded=true;document.fire("dom:loaded")}function d(){if(document.readyState==="complete"){document.stopObserving("readystatechange",d);b()}}if(document.addEventListener){document.addEventListener("DOMContentLoaded",b,false)}else{document.observe("readystatechange",d);if(window==top){var e=window.setInterval(function(){try{document.documentElement.doScroll("left")}catch(f){return}window.clearInterval(e);b()},5)}}Event.observe(window,"load",b)})();Element.addMethods();Hash.toQueryString=Object.toQueryString;var Toggle={display:Element.toggle};Element.Methods.childOf=Element.Methods.descendantOf;var Insertion={Before:function(b,d){return Element.insert(b,{before:d})},Top:function(b,d){return Element.insert(b,{top:d})},Bottom:function(b,d){return Element.insert(b,{bottom:d})},After:function(b,d){return Element.insert(b,{after:d})}};var $continue=new Error('"throw $continue" is deprecated, use "return" instead');var Position={includeScrollOffsets:false,prepare:function(){this.deltaX=window.pageXOffset||document.documentElement.scrollLeft||document.body.scrollLeft||0;this.deltaY=window.pageYOffset||document.documentElement.scrollTop||document.body.scrollTop||0},within:function(d,b,e){if(this.includeScrollOffsets){return this.withinIncludingScrolloffsets(d,b,e)}this.xcomp=b;this.ycomp=e;this.offset=Element.cumulativeOffset(d);return(e>=this.offset[1]&&e<this.offset[1]+d.offsetHeight&&b>=this.offset[0]&&b<this.offset[0]+d.offsetWidth)},withinIncludingScrolloffsets:function(d,b,f){var e=Element.cumulativeScrollOffset(d);this.xcomp=b+e[0]-this.deltaX;this.ycomp=f+e[1]-this.deltaY;this.offset=Element.cumulativeOffset(d);return(this.ycomp>=this.offset[1]&&this.ycomp<this.offset[1]+d.offsetHeight&&this.xcomp>=this.offset[0]&&this.xcomp<this.offset[0]+d.offsetWidth)},overlap:function(d,b){if(!d){return 0}if(d=="vertical"){return((this.offset[1]+b.offsetHeight)-this.ycomp)/b.offsetHeight}if(d=="horizontal"){return((this.offset[0]+b.offsetWidth)-this.xcomp)/b.offsetWidth}},cumulativeOffset:Element.Methods.cumulativeOffset,positionedOffset:Element.Methods.positionedOffset,absolutize:function(b){Position.prepare();return Element.absolutize(b)},relativize:function(b){Position.prepare();return Element.relativize(b)},realOffset:Element.Methods.cumulativeScrollOffset,offsetParent:Element.Methods.getOffsetParent,page:Element.Methods.viewportOffset,clone:function(d,e,b){b=b||{};return Element.clonePosition(e,d,b)}};if(!document.getElementsByClassName){document.getElementsByClassName=function(d){function b(e){return e.blank()?null:"[contains(concat(' ', @class, ' '), ' "+e+" ')]"}d.getElementsByClassName=Prototype.BrowserFeatures.XPath?function(e,g){g=g.toString().strip();var f=/\s/.test(g)?$w(g).map(b).join(""):b(g);return f?document._getElementsByXPath(".//*"+f,e):[]}:function(g,h){h=h.toString().strip();var l=[],n=(/\s/.test(h)?$w(h):null);if(!n&&!h){return l}var e=$(g).getElementsByTagName("*");h=" "+h+" ";for(var f=0,p,o;p=e[f];f++){if(p.className&&(o=" "+p.className+" ")&&(o.include(h)||(n&&n.all(function(q){return !q.toString().blank()&&o.include(" "+q+" ")})))){l.push(Element.extend(p))}}return l};return function(f,e){return $(e||document.body).getElementsByClassName(f)}}(Element.Methods)}Element.ClassNames=Class.create();Element.ClassNames.prototype={initialize:function(b){this.element=$(b)},_each:function(b){this.element.className.split(/\s+/).select(function(d){return d.length>0})._each(b)},set:function(b){this.element.className=b},add:function(b){if(this.include(b)){return}this.set($A(this).concat(b).join(" "))},remove:function(b){if(!this.include(b)){return}this.set($A(this).without(b).join(" "))},toString:function(){return $A(this).join(" ")}};Object.extend(Element.ClassNames.prototype,Enumerable);(function(){window.Selector=Class.create({initialize:function(b){this.expression=b.strip()},findElements:function(b){return Prototype.Selector.select(this.expression,b)},match:function(b){return Prototype.Selector.match(b,this.expression)},toString:function(){return this.expression},inspect:function(){return"#<Selector: "+this.expression+">"}});Object.extend(Selector,{matchElements:function(h,l){var b=Prototype.Selector.match,f=[];for(var e=0,g=h.length;e<g;e++){var d=h[e];if(b(d,l)){f.push(Element.extend(d))}}return f},findElement:function(h,l,d){d=d||0;var b=0,f;for(var e=0,g=h.length;e<g;e++){f=h[e];if(Prototype.Selector.match(f,l)&&d===b++){return Element.extend(f)}}},findChildElements:function(d,e){var b=e.toArray().join(", ");return Prototype.Selector.select(b,d||document)}})})();var Window=Class.create();Window.keepMultiModalWindow=false;Window.hasEffectLib=(typeof Effect!="undefined");Window.resizeEffectDuration=0.4;Window.prototype={initialize:function(){var e;var d=0;if(arguments.length>0){if(typeof arguments[0]=="string"){e=arguments[0];d=1}else{e=arguments[0]?arguments[0].id:null}}if(!e){e="window_"+new Date().getTime()}if($(e)){alert("Window "+e+" is already registered in the DOM! Make sure you use setDestroyOnClose() or destroyOnClose: true in the constructor")}this.options=Object.extend({className:"dialog",windowClassName:null,blurClassName:null,minWidth:100,minHeight:20,resizable:true,closable:true,minimizable:true,maximizable:true,draggable:true,userData:null,showEffect:(Window.hasEffectLib?Effect.Appear:Element.show),hideEffect:(Window.hasEffectLib?Effect.Fade:Element.hide),showEffectOptions:{},hideEffectOptions:{},effectOptions:null,parent:document.body,title:"&nbsp;",url:null,onload:Prototype.emptyFunction,width:200,height:300,opacity:1,recenterAuto:true,wiredDrag:false,closeOnEsc:true,closeCallback:null,destroyOnClose:false,gridX:1,gridY:1},arguments[d]||{});if(this.options.blurClassName){this.options.focusClassName=this.options.className}if(typeof this.options.top=="undefined"&&typeof this.options.bottom=="undefined"){this.options.top=this._round(Math.random()*500,this.options.gridY)}if(typeof this.options.left=="undefined"&&typeof this.options.right=="undefined"){this.options.left=this._round(Math.random()*500,this.options.gridX)}if(this.options.effectOptions){Object.extend(this.options.hideEffectOptions,this.options.effectOptions);Object.extend(this.options.showEffectOptions,this.options.effectOptions);if(this.options.showEffect==Element.Appear){this.options.showEffectOptions.to=this.options.opacity}}if(Window.hasEffectLib){if(this.options.showEffect==Effect.Appear){this.options.showEffectOptions.to=this.options.opacity}if(this.options.hideEffect==Effect.Fade){this.options.hideEffectOptions.from=this.options.opacity}}if(this.options.hideEffect==Element.hide){this.options.hideEffect=function(){Element.hide(this.element);if(this.options.destroyOnClose){this.destroy()}}.bind(this)}if(this.options.parent!=document.body){this.options.parent=$(this.options.parent)}this.element=this._createWindow(e);this.element.win=this;this.eventMouseDown=this._initDrag.bindAsEventListener(this);this.eventMouseUp=this._endDrag.bindAsEventListener(this);this.eventMouseMove=this._updateDrag.bindAsEventListener(this);this.eventOnLoad=this._getWindowBorderSize.bindAsEventListener(this);this.eventMouseDownContent=this.toFront.bindAsEventListener(this);this.eventResize=this._recenter.bindAsEventListener(this);this.eventKeyUp=this._keyUp.bindAsEventListener(this);this.topbar=$(this.element.id+"_top");this.bottombar=$(this.element.id+"_bottom");this.content=$(this.element.id+"_content");Event.observe(this.topbar,"mousedown",this.eventMouseDown);Event.observe(this.bottombar,"mousedown",this.eventMouseDown);Event.observe(this.content,"mousedown",this.eventMouseDownContent);Event.observe(window,"load",this.eventOnLoad);Event.observe(window,"resize",this.eventResize);Event.observe(window,"scroll",this.eventResize);Event.observe(document,"keyup",this.eventKeyUp);Event.observe(this.options.parent,"scroll",this.eventResize);if(this.options.draggable){var b=this;[this.topbar,this.topbar.up().previous(),this.topbar.up().next()].each(function(f){f.observe("mousedown",b.eventMouseDown);f.addClassName("top_draggable")});[this.bottombar.up(),this.bottombar.up().previous(),this.bottombar.up().next()].each(function(f){f.observe("mousedown",b.eventMouseDown);f.addClassName("bottom_draggable")})}if(this.options.resizable){this.sizer=$(this.element.id+"_sizer");Event.observe(this.sizer,"mousedown",this.eventMouseDown)}this.useLeft=null;this.useTop=null;if(typeof this.options.left!="undefined"){this.element.setStyle({left:parseFloat(this.options.left)+"px"});this.useLeft=true}else{this.element.setStyle({right:parseFloat(this.options.right)+"px"});this.useLeft=false}if(typeof this.options.top!="undefined"){this.element.setStyle({top:parseFloat(this.options.top)+"px"});this.useTop=true}else{this.element.setStyle({bottom:parseFloat(this.options.bottom)+"px"});this.useTop=false}this.storedLocation=null;this.setOpacity(this.options.opacity);if(this.options.zIndex){this.setZIndex(this.options.zIndex)}else{this.setZIndex(this.getMaxZIndex())}if(this.options.destroyOnClose){this.setDestroyOnClose(true)}this._getWindowBorderSize();this.width=this.options.width;this.height=this.options.height;this.visible=false;this.constraint=false;this.constraintPad={top:0,left:0,bottom:0,right:0};if(this.width&&this.height){this.setSize(this.options.width,this.options.height)}this.setTitle(this.options.title);Windows.register(this)},getMaxZIndex:function(){var b=0,d;var g=document.body.childNodes;for(d=0;d<g.length;d++){var e=g[d];var f=e.nodeType==1?parseInt(e.style.zIndex,10)||0:0;if(f<10000){b=Math.max(b,f)}}return b+10},destroy:function(){this._notify("onDestroy");Event.stopObserving(this.topbar,"mousedown",this.eventMouseDown);Event.stopObserving(this.bottombar,"mousedown",this.eventMouseDown);Event.stopObserving(this.content,"mousedown",this.eventMouseDownContent);Event.stopObserving(window,"load",this.eventOnLoad);Event.stopObserving(window,"resize",this.eventResize);Event.stopObserving(window,"scroll",this.eventResize);Event.stopObserving(this.content,"load",this.options.onload);Event.stopObserving(document,"keyup",this.eventKeyUp);if(this._oldParent){var e=this.getContent();var b=null;for(var d=0;d<e.childNodes.length;d++){b=e.childNodes[d];if(b.nodeType==1){break}b=null}if(b){this._oldParent.appendChild(b)}this._oldParent=null}if(this.sizer){Event.stopObserving(this.sizer,"mousedown",this.eventMouseDown)}if(this.options.url){this.content.src=null}if(this.iefix){Element.remove(this.iefix)}Element.remove(this.element);Windows.unregister(this)},setCloseCallback:function(b){this.options.closeCallback=b},getContent:function(){return this.content},setContent:function(n,l,e){var b=$(n);if(null==b){throw"Unable to find element '"+n+"' in DOM"}this._oldParent=b.parentNode;var h=null;var g=null;if(l){h=Element.getDimensions(b)}if(e){g=Position.cumulativeOffset(b)}var f=this.getContent();this.setHTMLContent("");f=this.getContent();f.appendChild(b);b.show();if(l){this.setSize(h.width,h.height)}if(e){this.setLocation(g[1]-this.heightN,g[0]-this.widthW)}},setHTMLContent:function(b){if(this.options.url){this.content.src=null;this.options.url=null;var d='<div id="'+this.getId()+'_content" class="'+this.options.className+'_content"> </div>';$(this.getId()+"_table_content").innerHTML=d;this.content=$(this.element.id+"_content")}this.getContent().innerHTML=b},setAjaxContent:function(d,b,f,e){this.showFunction=f?"showCenter":"show";this.showModal=e||false;b=b||{};this.setHTMLContent("");this.onComplete=b.onComplete;if(!this._onCompleteHandler){this._onCompleteHandler=this._setAjaxContent.bind(this)}b.onComplete=this._onCompleteHandler;new Ajax.Request(d,b);b.onComplete=this.onComplete},_setAjaxContent:function(b){Element.update(this.getContent(),b.responseText);if(this.onComplete){this.onComplete(b)}this.onComplete=null;this[this.showFunction](this.showModal)},setURL:function(b){if(this.options.url){this.content.src=null}this.options.url=b;var d="<iframe frameborder='0' name='"+this.getId()+"_content'  id='"+this.getId()+"_content' src='"+b+"' width='"+this.width+"' height='"+this.height+"'> </iframe>";$(this.getId()+"_table_content").innerHTML=d;this.content=$(this.element.id+"_content")},getURL:function(){return this.options.url?this.options.url:null},refresh:function(){if(this.options.url){$(this.element.getAttribute("id")+"_content").src=this.options.url}},setCookie:function(d,e,t,g,b){d=d||this.element.id;this.cookie=[d,e,t,g,b];var r=WindowUtilities.getCookie(d);if(r){var s=r.split(",");var p=s[0].split(":");var o=s[1].split(":");var q=parseFloat(s[2]),l=parseFloat(s[3]);var n=s[4];var f=s[5];this.setSize(q,l);if(n=="true"){this.doMinimize=true}else{if(f=="true"){this.doMaximize=true}}this.useLeft=p[0]=="l";this.useTop=o[0]=="t";this.element.setStyle(this.useLeft?{left:p[1]}:{right:p[1]});this.element.setStyle(this.useTop?{top:o[1]}:{bottom:o[1]})}},getId:function(){return this.element.id},setDestroyOnClose:function(){this.options.destroyOnClose=true},setConstraint:function(b,d){this.constraint=b;this.constraintPad=Object.extend(this.constraintPad,d||{});if(this.useTop&&this.useLeft){this.setLocation(parseFloat(this.element.style.top),parseFloat(this.element.style.left))}},_initDrag:function(d){if(Event.element(d)==this.sizer&&this.isMinimized()){return}if(Event.element(d)!=this.sizer&&this.isMaximized()){return}if(Prototype.Browser.IE&&this.heightN==0){this._getWindowBorderSize()}this.pointer=[this._round(Event.pointerX(d),this.options.gridX),this._round(Event.pointerY(d),this.options.gridY)];if(this.options.wiredDrag){this.currentDrag=this._createWiredElement()}else{this.currentDrag=this.element}if(Event.element(d)==this.sizer){this.doResize=true;this.widthOrg=this.width;this.heightOrg=this.height;this.bottomOrg=parseFloat(this.element.getStyle("bottom"));this.rightOrg=parseFloat(this.element.getStyle("right"));this._notify("onStartResize")}else{this.doResize=false;var b=$(this.getId()+"_close");if(b&&Position.within(b,this.pointer[0],this.pointer[1])){this.currentDrag=null;return}this.toFront();if(!this.options.draggable){return}this._notify("onStartMove")}Event.observe(document,"mouseup",this.eventMouseUp,false);Event.observe(document,"mousemove",this.eventMouseMove,false);WindowUtilities.disableScreen("__invisible__","__invisible__",this.overlayOpacity);document.body.ondrag=function(){return false};document.body.onselectstart=function(){return false};this.currentDrag.show();Event.stop(d)},_round:function(d,b){return b==1?d:d=Math.floor(d/b)*b},_updateDrag:function(d){var b=[this._round(Event.pointerX(d),this.options.gridX),this._round(Event.pointerY(d),this.options.gridY)];var q=b[0]-this.pointer[0];var p=b[1]-this.pointer[1];if(this.doResize){var o=this.widthOrg+q;var f=this.heightOrg+p;q=this.width-this.widthOrg;p=this.height-this.heightOrg;if(this.useLeft){o=this._updateWidthConstraint(o)}else{this.currentDrag.setStyle({right:(this.rightOrg-q)+"px"})}if(this.useTop){f=this._updateHeightConstraint(f)}else{this.currentDrag.setStyle({bottom:(this.bottomOrg-p)+"px"})}this.setSize(o,f);this._notify("onResize")}else{this.pointer=b;if(this.useLeft){var e=parseFloat(this.currentDrag.getStyle("left"))+q;var n=this._updateLeftConstraint(e);this.pointer[0]+=n-e;this.currentDrag.setStyle({left:n+"px"})}else{this.currentDrag.setStyle({right:parseFloat(this.currentDrag.getStyle("right"))-q+"px"})}if(this.useTop){var l=parseFloat(this.currentDrag.getStyle("top"))+p;var g=this._updateTopConstraint(l);this.pointer[1]+=g-l;this.currentDrag.setStyle({top:g+"px"})}else{this.currentDrag.setStyle({bottom:parseFloat(this.currentDrag.getStyle("bottom"))-p+"px"})}this._notify("onMove")}if(this.iefix){this._fixIEOverlapping()}this._removeStoreLocation();Event.stop(d)},_endDrag:function(b){WindowUtilities.enableScreen("__invisible__");if(this.doResize){this._notify("onEndResize")}else{this._notify("onEndMove")}Event.stopObserving(document,"mouseup",this.eventMouseUp,false);Event.stopObserving(document,"mousemove",this.eventMouseMove,false);Event.stop(b);this._hideWiredElement();this._saveCookie();document.body.ondrag=null;document.body.onselectstart=null},_updateLeftConstraint:function(d){if(this.constraint&&this.useLeft&&this.useTop){var b=this.options.parent==document.body?WindowUtilities.getPageSize().windowWidth:this.options.parent.getDimensions().width;if(d<this.constraintPad.left){d=this.constraintPad.left}if(d+this.width+this.widthE+this.widthW>b-this.constraintPad.right){d=b-this.constraintPad.right-this.width-this.widthE-this.widthW}}return d},_updateTopConstraint:function(e){if(this.constraint&&this.useLeft&&this.useTop){var b=this.options.parent==document.body?WindowUtilities.getPageSize().windowHeight:this.options.parent.getDimensions().height;var d=this.height+this.heightN+this.heightS;if(e<this.constraintPad.top){e=this.constraintPad.top}if(e+d>b-this.constraintPad.bottom){e=b-this.constraintPad.bottom-d}}return e},_updateWidthConstraint:function(b){if(this.constraint&&this.useLeft&&this.useTop){var d=this.options.parent==document.body?WindowUtilities.getPageSize().windowWidth:this.options.parent.getDimensions().width;var e=parseFloat(this.element.getStyle("left"));if(e+b+this.widthE+this.widthW>d-this.constraintPad.right){b=d-this.constraintPad.right-e-this.widthE-this.widthW}}return b},_updateHeightConstraint:function(d){if(this.constraint&&this.useLeft&&this.useTop){var b=this.options.parent==document.body?WindowUtilities.getPageSize().windowHeight:this.options.parent.getDimensions().height;var e=parseFloat(this.element.getStyle("top"));if(e+d+this.heightN+this.heightS>b-this.constraintPad.bottom){d=b-this.constraintPad.bottom-e-this.heightN-this.heightS}}return d},_createWindow:function(b){var h=this.options.className;var f=document.createElement("div");f.setAttribute("id",b);f.className="dialog";if(this.options.windowClassName){f.className+=" "+this.options.windowClassName}var g;if(this.options.url){g='<iframe frameborder="0" name="'+b+'_content"  id="'+b+'_content" src="'+this.options.url+'"> </iframe>'}else{g='<div id="'+b+'_content" class="'+h+'_content"> </div>'}var l=this.options.closable?"<div class='"+h+"_close' id='"+b+"_close' onclick='Windows.close(\""+b+"\", event)'> </div>":"";var n=this.options.minimizable?"<div class='"+h+"_minimize' id='"+b+"_minimize' onclick='Windows.minimize(\""+b+"\", event)'> </div>":"";var o=this.options.maximizable?"<div class='"+h+"_maximize' id='"+b+"_maximize' onclick='Windows.maximize(\""+b+"\", event)'> </div>":"";var e=this.options.resizable?"class='"+h+"_sizer' id='"+b+"_sizer'":"class='"+h+"_se'";var d="../themes/default/blank.gif";f.innerHTML=l+n+o+"      <a href='#' id='"+b+"_focus_anchor'><!-- --></a>      <table id='"+b+"_row1' class=\"top table_window\">        <tr>          <td class='"+h+"_nw'></td>          <td class='"+h+"_n'><div id='"+b+"_top' class='"+h+"_title title_window'>"+this.options.title+"</div></td>          <td class='"+h+"_ne'></td>        </tr>      </table>      <table id='"+b+"_row2' class=\"mid table_window\">        <tr>          <td class='"+h+"_w'></td>            <td id='"+b+"_table_content' class='"+h+"_content' valign='top'>"+g+"</td>          <td class='"+h+"_e'></td>        </tr>      </table>        <table id='"+b+"_row3' class=\"bot table_window\">        <tr>          <td class='"+h+"_sw'></td>            <td class='"+h+"_s'><div id='"+b+"_bottom' class='status_bar'><span style='float:left; width:1px; height:1px'></span></div></td>            <td "+e+"></td>        </tr>      </table>    ";Element.hide(f);this.options.parent.insertBefore(f,this.options.parent.firstChild);Event.observe($(b+"_content"),"load",this.options.onload);return f},changeClassName:function(b){var d=this.options.className;var e=this.getId();$A(["_close","_minimize","_maximize","_sizer","_content"]).each(function(f){this._toggleClassName($(e+f),d+f,b+f)}.bind(this));this._toggleClassName($(e+"_top"),d+"_title",b+"_title");$$("#"+e+" td").each(function(f){f.className=f.className.sub(d,b)});this.options.className=b},_toggleClassName:function(e,d,b){if(e){e.removeClassName(d);e.addClassName(b)}},setLocation:function(f,d){f=this._updateTopConstraint(f);d=this._updateLeftConstraint(d);var b=this.currentDrag||this.element;b.setStyle({top:f+"px"});b.setStyle({left:d+"px"});this.useLeft=true;this.useTop=true},getLocation:function(){var b={};if(this.useTop){b=Object.extend(b,{top:this.element.getStyle("top")})}else{b=Object.extend(b,{bottom:this.element.getStyle("bottom")})}if(this.useLeft){b=Object.extend(b,{left:this.element.getStyle("left")})}else{b=Object.extend(b,{right:this.element.getStyle("right")})}return b},getSize:function(){return{width:this.width,height:this.height}},setSize:function(f,d,b){f=parseFloat(f);d=parseFloat(d);if(!this.minimized&&f<this.options.minWidth){f=this.options.minWidth}if(!this.minimized&&d<this.options.minHeight){d=this.options.minHeight}if(this.options.maxHeight&&d>this.options.maxHeight){d=this.options.maxHeight}if(this.options.maxWidth&&f>this.options.maxWidth){f=this.options.maxWidth}if(this.useTop&&this.useLeft&&Window.hasEffectLib&&Effect.ResizeWindow&&b){new Effect.ResizeWindow(this,null,null,f,d,{duration:Window.resizeEffectDuration})}else{this.width=f;this.height=d;var h=this.currentDrag?this.currentDrag:this.element;h.setStyle({width:f+this.widthW+this.widthE+"px"});h.setStyle({height:d+this.heightN+this.heightS+"px"});if(!this.currentDrag||this.currentDrag==this.element){var g=$(this.element.id+"_content");g.setStyle({height:d+"px"});g.setStyle({width:f+"px"})}}},updateHeight:function(){this.setSize(this.width,this.content.scrollHeight,true)},updateWidth:function(){this.setSize(this.content.scrollWidth,this.height,true)},toFront:function(){if(this.element.style.zIndex<Windows.maxZIndex){this.setZIndex(Windows.maxZIndex+1)}if(this.iefix){this._fixIEOverlapping()}},getBounds:function(d){if(!this.width||!this.height||!this.visible){this.computeBounds()}var b=this.width;var e=this.height;if(!d){b+=this.widthW+this.widthE;e+=this.heightN+this.heightS}var f=Object.extend(this.getLocation(),{width:b+"px",height:e+"px"});return f},computeBounds:function(){if(!this.width||!this.height){var b=WindowUtilities._computeSize(this.content.innerHTML,this.content.id,this.width,this.height,0,this.options.className);if(this.height){this.width=b+5}else{this.height=b+5}}this.setSize(this.width,this.height);if(this.centered){this._center(this.centerTop,this.centerLeft)}},show:function(d){this.visible=true;if(d){if(typeof this.overlayOpacity=="undefined"){var b=this;setTimeout(function(){b.show(d)},10);return}Windows.addModalWindow(this);this.modal=true;this.setZIndex(Windows.maxZIndex+1);Windows.unsetOverflow(this)}else{if(!this.element.style.zIndex){this.setZIndex(Windows.maxZIndex+1)}}if(this.oldStyle){this.getContent().setStyle({overflow:this.oldStyle})}this.computeBounds();this._notify("onBeforeShow");if(this.options.showEffect!=Element.show&&this.options.showEffectOptions){this.options.showEffect(this.element,this.options.showEffectOptions)}else{this.options.showEffect(this.element)}this._checkIEOverlapping();WindowUtilities.focusedWindow=this;this._notify("onShow");$(this.element.id+"_focus_anchor").focus()},showCenter:function(b,e,d){this.centered=true;this.centerTop=e;this.centerLeft=d;this.show(b)},isVisible:function(){return this.visible},_center:function(e,d){var f=WindowUtilities.getWindowScroll(this.options.parent);var b=WindowUtilities.getPageSize(this.options.parent);if(typeof e=="undefined"){e=(b.windowHeight-(this.height+this.heightN+this.heightS))/2}e+=f.top;if(typeof d=="undefined"){d=(b.windowWidth-(this.width+this.widthW+this.widthE))/2}d+=f.left;this.setLocation(e,d);this.toFront()},_recenter:function(d){if(this.centered){var b=WindowUtilities.getPageSize(this.options.parent);var e=WindowUtilities.getWindowScroll(this.options.parent);if(this.pageSize&&this.pageSize.windowWidth==b.windowWidth&&this.pageSize.windowHeight==b.windowHeight&&this.windowScroll.left==e.left&&this.windowScroll.top==e.top){return}this.pageSize=b;this.windowScroll=e;if($("overlay_modal")){$("overlay_modal").setStyle({height:(b.pageHeight+"px")})}if(this.options.recenterAuto){this._center(this.centerTop,this.centerLeft)}}},hide:function(){this.visible=false;if(this.modal){Windows.removeModalWindow(this);Windows.resetOverflow()}this.oldStyle=this.getContent().getStyle("overflow")||"auto";this.getContent().setStyle({overflow:"hidden"});this.options.hideEffect(this.element,this.options.hideEffectOptions);if(this.iefix){this.iefix.hide()}if(!this.doNotNotifyHide){this._notify("onHide")}},close:function(){if(this.visible){if(this.options.closeCallback&&!this.options.closeCallback(this)){return}if(this.options.destroyOnClose){var b=this.destroy.bind(this);if(this.options.hideEffectOptions.afterFinish){var d=this.options.hideEffectOptions.afterFinish;this.options.hideEffectOptions.afterFinish=function(){d();b()}}else{this.options.hideEffectOptions.afterFinish=function(){b()}}}Windows.updateFocusedWindow();this.doNotNotifyHide=true;this.hide();this.doNotNotifyHide=false;this._notify("onClose")}},minimize:function(){if(this.resizing){return}var b=$(this.getId()+"_row2");if(!this.minimized){this.minimized=true;var f=b.getDimensions().height;this.r2Height=f;var e=this.element.getHeight()-f;if(this.useLeft&&this.useTop&&Window.hasEffectLib&&Effect.ResizeWindow){new Effect.ResizeWindow(this,null,null,null,this.height-f,{duration:Window.resizeEffectDuration})}else{this.height-=f;this.element.setStyle({height:e+"px"});b.hide()}if(!this.useTop){var d=parseFloat(this.element.getStyle("bottom"));this.element.setStyle({bottom:(d+f)+"px"})}}else{this.minimized=false;var f=this.r2Height;this.r2Height=null;if(this.useLeft&&this.useTop&&Window.hasEffectLib&&Effect.ResizeWindow){new Effect.ResizeWindow(this,null,null,null,this.height+f,{duration:Window.resizeEffectDuration})}else{var e=this.element.getHeight()+f;this.height+=f;this.element.setStyle({height:e+"px"});b.show()}if(!this.useTop){var d=parseFloat(this.element.getStyle("bottom"));this.element.setStyle({bottom:(d-f)+"px"})}this.toFront()}this._notify("onMinimize");this._saveCookie()},maximize:function(){if(this.isMinimized()||this.resizing){return}if(Prototype.Browser.IE&&this.heightN==0){this._getWindowBorderSize()}if(this.storedLocation!=null){this._restoreLocation();if(this.iefix){this.iefix.hide()}}else{this._storeLocation();Windows.unsetOverflow(this);var l=WindowUtilities.getWindowScroll(this.options.parent);var d=WindowUtilities.getPageSize(this.options.parent);var h=l.left;var g=l.top;if(this.options.parent!=document.body){l={top:0,left:0,bottom:0,right:0};var f=this.options.parent.getDimensions();d.windowWidth=f.width;d.windowHeight=f.height;g=0;h=0}if(this.constraint){d.windowWidth-=Math.max(0,this.constraintPad.left)+Math.max(0,this.constraintPad.right);d.windowHeight-=Math.max(0,this.constraintPad.top)+Math.max(0,this.constraintPad.bottom);h+=Math.max(0,this.constraintPad.left);g+=Math.max(0,this.constraintPad.top)}var e=d.windowWidth-this.widthW-this.widthE;var b=d.windowHeight-this.heightN-this.heightS;if(this.useLeft&&this.useTop&&Window.hasEffectLib&&Effect.ResizeWindow){new Effect.ResizeWindow(this,g,h,e,b,{duration:Window.resizeEffectDuration})}else{this.setSize(e,b);this.element.setStyle(this.useLeft?{left:h}:{right:h});this.element.setStyle(this.useTop?{top:g}:{bottom:g})}this.toFront();if(this.iefix){this._fixIEOverlapping()}}this._notify("onMaximize");this._saveCookie()},isMinimized:function(){return this.minimized},isMaximized:function(){return(this.storedLocation!=null)},setOpacity:function(b){if(Element.setOpacity){Element.setOpacity(this.element,b)}},setZIndex:function(b){this.element.setStyle({zIndex:b});Windows.updateZindex(b,this)},setTitle:function(b){if(!b||b==""){b="&nbsp;"}Element.update(this.element.id+"_top",b)},getTitle:function(){return $(this.element.id+"_top").innerHTML},setStatusBar:function(d){var b=$(this.getId()+"_bottom");if(typeof(d)=="object"){if(this.bottombar.firstChild){this.bottombar.replaceChild(d,this.bottombar.firstChild)}else{this.bottombar.appendChild(d)}}else{this.bottombar.innerHTML=d}},_checkIEOverlapping:function(){if(!this.iefix&&(navigator.appVersion.indexOf("MSIE")>0)&&(navigator.userAgent.indexOf("Opera")<0)&&(this.element.getStyle("position")=="absolute")){new Insertion.After(this.element.id,'<iframe id="'+this.element.id+'_iefix" style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" src="javascript:false;" frameborder="0" scrolling="no"></iframe>');this.iefix=$(this.element.id+"_iefix")}if(this.iefix){setTimeout(this._fixIEOverlapping.bind(this),50)}},_fixIEOverlapping:function(){Position.clone(this.element,this.iefix);this.iefix.style.zIndex=this.element.style.zIndex-1;this.iefix.show()},_keyUp:function(b){if(27==b.keyCode&&this.options.closeOnEsc){this.close()}},_getWindowBorderSize:function(d){var e=this._createHiddenDiv(this.options.className+"_n");this.heightN=Element.getDimensions(e).height;e.parentNode.removeChild(e);var e=this._createHiddenDiv(this.options.className+"_s");this.heightS=Element.getDimensions(e).height;e.parentNode.removeChild(e);var e=this._createHiddenDiv(this.options.className+"_e");this.widthE=Element.getDimensions(e).width;e.parentNode.removeChild(e);var e=this._createHiddenDiv(this.options.className+"_w");this.widthW=Element.getDimensions(e).width;e.parentNode.removeChild(e);var e=document.createElement("div");e.className="overlay_"+this.options.className;document.body.appendChild(e);var b=this;setTimeout(function(){b.overlayOpacity=($(e).getStyle("opacity"));e.parentNode.removeChild(e)},10);if(Prototype.Browser.IE){this.heightS=$(this.getId()+"_row3").getDimensions().height;this.heightN=$(this.getId()+"_row1").getDimensions().height}if(Prototype.Browser.WebKit&&Prototype.Browser.WebKitVersion<420){this.setSize(this.width,this.height)}if(this.doMaximize){this.maximize()}if(this.doMinimize){this.minimize()}},_createHiddenDiv:function(d){var b=document.body;var e=document.createElement("div");e.setAttribute("id",this.element.id+"_tmp");e.className=d;e.style.display="none";e.innerHTML="";b.insertBefore(e,b.firstChild);return e},_storeLocation:function(){if(this.storedLocation==null){this.storedLocation={useTop:this.useTop,useLeft:this.useLeft,top:this.element.getStyle("top"),bottom:this.element.getStyle("bottom"),left:this.element.getStyle("left"),right:this.element.getStyle("right"),width:this.width,height:this.height}}},_restoreLocation:function(){if(this.storedLocation!=null){this.useLeft=this.storedLocation.useLeft;this.useTop=this.storedLocation.useTop;if(this.useLeft&&this.useTop&&Window.hasEffectLib&&Effect.ResizeWindow){new Effect.ResizeWindow(this,this.storedLocation.top,this.storedLocation.left,this.storedLocation.width,this.storedLocation.height,{duration:Window.resizeEffectDuration})}else{this.element.setStyle(this.useLeft?{left:this.storedLocation.left}:{right:this.storedLocation.right});this.element.setStyle(this.useTop?{top:this.storedLocation.top}:{bottom:this.storedLocation.bottom});this.setSize(this.storedLocation.width,this.storedLocation.height)}Windows.resetOverflow();this._removeStoreLocation()}},_removeStoreLocation:function(){this.storedLocation=null},_saveCookie:function(){if(this.cookie){var b="";if(this.useLeft){b+="l:"+(this.storedLocation?this.storedLocation.left:this.element.getStyle("left"))}else{b+="r:"+(this.storedLocation?this.storedLocation.right:this.element.getStyle("right"))}if(this.useTop){b+=",t:"+(this.storedLocation?this.storedLocation.top:this.element.getStyle("top"))}else{b+=",b:"+(this.storedLocation?this.storedLocation.bottom:this.element.getStyle("bottom"))}b+=","+(this.storedLocation?this.storedLocation.width:this.width);b+=","+(this.storedLocation?this.storedLocation.height:this.height);b+=","+this.isMinimized();b+=","+this.isMaximized();WindowUtilities.setCookie(b,this.cookie)}},_createWiredElement:function(){if(!this.wiredElement){if(Prototype.Browser.IE){this._getWindowBorderSize()}var d=document.createElement("div");d.className="wired_frame "+this.options.className+"_wired_frame";d.style.position="absolute";this.options.parent.insertBefore(d,this.options.parent.firstChild);this.wiredElement=$(d)}if(this.useLeft){this.wiredElement.setStyle({left:this.element.getStyle("left")})}else{this.wiredElement.setStyle({right:this.element.getStyle("right")})}if(this.useTop){this.wiredElement.setStyle({top:this.element.getStyle("top")})}else{this.wiredElement.setStyle({bottom:this.element.getStyle("bottom")})}var b=this.element.getDimensions();this.wiredElement.setStyle({width:b.width+"px",height:b.height+"px"});this.wiredElement.setStyle({zIndex:Windows.maxZIndex+30});return this.wiredElement},_hideWiredElement:function(){if(!this.wiredElement||!this.currentDrag){return}if(this.currentDrag==this.element){this.currentDrag=null}else{if(this.useLeft){this.element.setStyle({left:this.currentDrag.getStyle("left")})}else{this.element.setStyle({right:this.currentDrag.getStyle("right")})}if(this.useTop){this.element.setStyle({top:this.currentDrag.getStyle("top")})}else{this.element.setStyle({bottom:this.currentDrag.getStyle("bottom")})}this.currentDrag.hide();this.currentDrag=null;if(this.doResize){this.setSize(this.width,this.height)}}},_notify:function(b){if(this.options[b]){this.options[b](this)}else{Windows.notify(b,this)}}};var Windows={windows:[],modalWindows:[],observers:[],focusedWindow:null,maxZIndex:0,overlayShowEffectOptions:{duration:0.5},overlayHideEffectOptions:{duration:0.5},addObserver:function(b){this.removeObserver(b);this.observers.push(b)},removeObserver:function(b){this.observers=this.observers.reject(function(d){return d==b})},notify:function(b,d){this.observers.each(function(e){if(e[b]){e[b](b,d)}})},getWindow:function(b){return this.windows.detect(function(e){return e.getId()==b})},getFocusedWindow:function(){return this.focusedWindow},updateFocusedWindow:function(){this.focusedWindow=this.windows.length>=2?this.windows[this.windows.length-2]:null},register:function(b){this.windows.push(b)},addModalWindow:function(b){if(this.modalWindows.length==0){WindowUtilities.disableScreen(b.options.className,"overlay_modal",b.overlayOpacity,b.getId(),b.options.parent)}else{if(Window.keepMultiModalWindow){$("overlay_modal").style.zIndex=Windows.maxZIndex+1;Windows.maxZIndex+=1;WindowUtilities._hideSelect(this.modalWindows.last().getId())}else{this.modalWindows.last().element.hide()}WindowUtilities._showSelect(b.getId())}this.modalWindows.push(b)},removeModalWindow:function(b){this.modalWindows.pop();if(this.modalWindows.length==0){WindowUtilities.enableScreen()}else{if(Window.keepMultiModalWindow){this.modalWindows.last().toFront();WindowUtilities._showSelect(this.modalWindows.last().getId())}else{this.modalWindows.last().element.show()}}},register:function(b){this.windows.push(b)},unregister:function(b){this.windows=this.windows.reject(function(e){return e==b})},closeAll:function(){this.windows.each(function(b){Windows.close(b.getId())})},closeAllModalWindows:function(){WindowUtilities.enableScreen();this.modalWindows.each(function(b){if(b){b.close()}})},minimize:function(e,b){var d=this.getWindow(e);if(d&&d.visible){d.minimize()}Event.stop(b)},maximize:function(e,b){var d=this.getWindow(e);if(d&&d.visible){d.maximize()}Event.stop(b)},close:function(e,b){var d=this.getWindow(e);if(d){d.close()}if(b){Event.stop(b)}},blur:function(d){var b=this.getWindow(d);if(!b){return}if(b.options.blurClassName){b.changeClassName(b.options.blurClassName)}if(this.focusedWindow==b){this.focusedWindow=null}b._notify("onBlur")},focus:function(d){var b=this.getWindow(d);if(!b){return}if(this.focusedWindow){this.blur(this.focusedWindow.getId())}if(b.options.focusClassName){b.changeClassName(b.options.focusClassName)}this.focusedWindow=b;b._notify("onFocus")},unsetOverflow:function(b){this.windows.each(function(e){e.oldOverflow=e.getContent().getStyle("overflow")||"auto";e.getContent().setStyle({overflow:"hidden"})});if(b&&b.oldOverflow){b.getContent().setStyle({overflow:b.oldOverflow})}},resetOverflow:function(){this.windows.each(function(b){if(b.oldOverflow){b.getContent().setStyle({overflow:b.oldOverflow})}})},updateZindex:function(b,d){if(b>this.maxZIndex){this.maxZIndex=b;if(this.focusedWindow){this.blur(this.focusedWindow.getId())}}this.focusedWindow=d;if(this.focusedWindow){this.focus(this.focusedWindow.getId())}}};var Dialog={dialogId:null,onCompleteFunc:null,callFunc:null,parameters:null,confirm:function(f,e){if(f&&typeof f!="string"){Dialog._runAjaxRequest(f,e,Dialog.confirm);return}f=f||"";e=e||{};var h=e.okLabel?e.okLabel:"Ok";var b=e.cancelLabel?e.cancelLabel:"Cancel";e=Object.extend(e,e.windowParameters||{});e.windowParameters=e.windowParameters||{};e.className=e.className||"alert";var d="class ='"+(e.buttonClass?e.buttonClass+" ":"")+" ok_button'";var g="class ='"+(e.buttonClass?e.buttonClass+" ":"")+" cancel_button'";var f="      <div class='"+e.className+"_message'>"+f+"</div>        <div class='"+e.className+"_buttons'>          <button type='button' title='"+h+"' onclick='Dialog.okCallback()' "+d+"><span><span><span>"+h+"</span></span></span></button>          <button type='button' title='"+b+"' onclick='Dialog.cancelCallback()' "+g+"><span><span><span>"+b+"</span></span></span></button>        </div>    ";return this._openDialog(f,e)},alert:function(e,d){if(e&&typeof e!="string"){Dialog._runAjaxRequest(e,d,Dialog.alert);return}e=e||"";d=d||{};var f=d.okLabel?d.okLabel:"Ok";d=Object.extend(d,d.windowParameters||{});d.windowParameters=d.windowParameters||{};d.className=d.className||"alert";var b="class ='"+(d.buttonClass?d.buttonClass+" ":"")+" ok_button'";var e="      <div class='"+d.className+"_message'>"+e+"</div>        <div class='"+d.className+"_buttons'>          <button type='button' title='"+f+"' onclick='Dialog.okCallback()' "+b+"><span><span><span>"+f+"</span></span></span></button>        </div>";return this._openDialog(e,d)},info:function(d,b){if(d&&typeof d!="string"){Dialog._runAjaxRequest(d,b,Dialog.info);return}d=d||"";b=b||{};b=Object.extend(b,b.windowParameters||{});b.windowParameters=b.windowParameters||{};b.className=b.className||"alert";var d="<div id='modal_dialog_message' class='"+b.className+"_message'>"+d+"</div>";if(b.showProgress){d+="<div id='modal_dialog_progress' class='"+b.className+"_progress'>  </div>"}b.ok=null;b.cancel=null;return this._openDialog(d,b)},setInfoMessage:function(b){$("modal_dialog_message").update(b)},closeInfo:function(){Windows.close(this.dialogId)},_openDialog:function(g,f){var e=f.className;if(!f.height&&!f.width){f.width=WindowUtilities.getPageSize(f.options.parent||document.body).pageWidth/2}if(f.id){this.dialogId=f.id}else{var d=new Date();this.dialogId="modal_dialog_"+d.getTime();f.id=this.dialogId}if(!f.height||!f.width){var b=WindowUtilities._computeSize(g,this.dialogId,f.width,f.height,5,e);if(f.height){f.width=b+5}else{f.height=b+5}}f.effectOptions=f.effectOptions;f.resizable=f.resizable||false;f.minimizable=f.minimizable||false;f.maximizable=f.maximizable||false;f.draggable=f.draggable||false;f.closable=f.closable||false;var h=new Window(f);h.getContent().innerHTML=g;h.showCenter(true,f.top,f.left);h.setDestroyOnClose();h.cancelCallback=f.onCancel||f.cancel;h.okCallback=f.onOk||f.ok;return h},_getAjaxContent:function(b){Dialog.callFunc(b.responseText,Dialog.parameters)},_runAjaxRequest:function(e,d,b){if(e.options==null){e.options={}}Dialog.onCompleteFunc=e.options.onComplete;Dialog.parameters=d;Dialog.callFunc=b;e.options.onComplete=Dialog._getAjaxContent;new Ajax.Request(e.url,e.options)},okCallback:function(){var b=Windows.focusedWindow;if(!b.okCallback||b.okCallback(b)){$$("#"+b.getId()+" input").each(function(d){d.onclick=null});b.close()}},cancelCallback:function(){var b=Windows.focusedWindow;$$("#"+b.getId()+" input").each(function(d){d.onclick=null});b.close();if(b.cancelCallback){b.cancelCallback(b)}}};if(Prototype.Browser.WebKit){var array=navigator.userAgent.match(new RegExp(/AppleWebKit\/([\d\.\+]*)/));Prototype.Browser.WebKitVersion=parseFloat(array[1])}var WindowUtilities={getWindowScroll:function(parent){var T,L,W,H;parent=parent||document.body;if(parent!=document.body){T=parent.scrollTop;L=parent.scrollLeft;W=parent.scrollWidth;H=parent.scrollHeight}else{var w=window;with(w.document){if(w.document.documentElement&&documentElement.scrollTop){T=documentElement.scrollTop;L=documentElement.scrollLeft}else{if(w.document.body){T=body.scrollTop;L=body.scrollLeft}}if(w.innerWidth){W=w.innerWidth;H=w.innerHeight}else{if(w.document.documentElement&&documentElement.clientWidth){W=documentElement.clientWidth;H=documentElement.clientHeight}else{W=body.offsetWidth;H=body.offsetHeight}}}}return{top:T,left:L,width:W,height:H}},getPageSize:function(f){f=f||document.body;var e,l;var g,d;if(f!=document.body){e=f.getWidth();l=f.getHeight();d=f.scrollWidth;g=f.scrollHeight}else{var h,b;if(window.innerHeight&&window.scrollMaxY){h=document.body.scrollWidth;b=window.innerHeight+window.scrollMaxY}else{if(document.body.scrollHeight>document.body.offsetHeight){h=document.body.scrollWidth;b=document.body.scrollHeight}else{h=document.body.offsetWidth;b=document.body.offsetHeight}}if(self.innerHeight){e=document.documentElement.clientWidth;l=self.innerHeight}else{if(document.documentElement&&document.documentElement.clientHeight){e=document.documentElement.clientWidth;l=document.documentElement.clientHeight}else{if(document.body){e=document.body.clientWidth;l=document.body.clientHeight}}}if(b<l){g=l}else{g=b}if(h<e){d=e}else{d=h}}return{pageWidth:d,pageHeight:g,windowWidth:e,windowHeight:l}},disableScreen:function(e,b,f,g,d){WindowUtilities.initLightbox(b,e,function(){this._disableScreen(e,b,f,g)}.bind(this),d||document.body)},_disableScreen:function(e,d,g,h){var f=$(d);var b=WindowUtilities.getPageSize(f.parentNode);if(h&&Prototype.Browser.IE){WindowUtilities._hideSelect();WindowUtilities._showSelect(h)}f.style.height=(b.pageHeight+"px");f.style.display="none";if(d=="overlay_modal"&&Window.hasEffectLib&&Windows.overlayShowEffectOptions){f.overlayOpacity=g;new Effect.Appear(f,Object.extend({from:0,to:g},Windows.overlayShowEffectOptions))}else{f.style.display="block"}},enableScreen:function(d){d=d||"overlay_modal";var b=$(d);if(b){if(d=="overlay_modal"&&Window.hasEffectLib&&Windows.overlayHideEffectOptions){new Effect.Fade(b,Object.extend({from:b.overlayOpacity,to:0},Windows.overlayHideEffectOptions))}else{b.style.display="none";b.parentNode.removeChild(b)}if(d!="__invisible__"){WindowUtilities._showSelect()}}},_hideSelect:function(b){if(Prototype.Browser.IE){b=b==null?"":"#"+b+" ";$$(b+"select").each(function(d){if(!WindowUtilities.isDefined(d.oldVisibility)){d.oldVisibility=d.style.visibility?d.style.visibility:"visible";d.style.visibility="hidden"}})}},_showSelect:function(b){if(Prototype.Browser.IE){b=b==null?"":"#"+b+" ";$$(b+"select").each(function(d){if(WindowUtilities.isDefined(d.oldVisibility)){try{d.style.visibility=d.oldVisibility}catch(f){d.style.visibility="visible"}d.oldVisibility=null}else{if(d.style.visibility){d.style.visibility="visible"}}})}},isDefined:function(b){return typeof(b)!="undefined"&&b!=null},initLightbox:function(g,e,b,d){if($(g)){Element.setStyle(g,{zIndex:Windows.maxZIndex+1});Windows.maxZIndex++;b()}else{var f=document.createElement("div");f.setAttribute("id",g);f.className="overlay_"+e;f.style.display="none";f.style.position="absolute";f.style.top="0";f.style.left="0";f.style.zIndex=Windows.maxZIndex+1;Windows.maxZIndex++;f.style.width="100%";d.insertBefore(f,d.firstChild);if(Prototype.Browser.WebKit&&g=="overlay_modal"){setTimeout(function(){b()},10)}else{b()}}},setCookie:function(d,b){document.cookie=b[0]+"="+escape(d)+((b[1])?"; expires="+b[1].toUTCString():"")+((b[2])?"; path="+b[2]:"")+((b[3])?"; domain="+b[3]:"")+((b[4])?"; secure":"")},getCookie:function(e){var d=document.cookie;var g=e+"=";var f=d.indexOf("; "+g);if(f==-1){f=d.indexOf(g);if(f!=0){return null}}else{f+=2}var b=document.cookie.indexOf(";",f);if(b==-1){b=d.length}return unescape(d.substring(f+g.length,b))},_computeSize:function(g,b,d,l,f,h){var o=document.body;var e=document.createElement("div");e.setAttribute("id",b);e.className=h+"_content";if(l){e.style.height=l+"px"}else{e.style.width=d+"px"}e.style.position="absolute";e.style.top="0";e.style.left="0";e.style.display="none";e.innerHTML=g;o.insertBefore(e,o.firstChild);var n;if(l){n=$(e).getDimensions().width+f}else{n=$(e).getDimensions().height+f}o.removeChild(e);return n}};var Builder={NODEMAP:{AREA:"map",CAPTION:"table",COL:"table",COLGROUP:"table",LEGEND:"fieldset",OPTGROUP:"select",OPTION:"select",PARAM:"object",TBODY:"table",TD:"table",TFOOT:"table",TH:"table",THEAD:"table",TR:"table"},node:function(b){b=b.toUpperCase();var l=this.NODEMAP[b]||"div";var d=document.createElement(l);try{d.innerHTML="<"+b+"></"+b+">"}catch(h){}var g=d.firstChild||null;if(g&&(g.tagName.toUpperCase()!=b)){g=g.getElementsByTagName(b)[0]}if(!g){g=document.createElement(b)}if(!g){return}if(arguments[1]){if(this._isStringOrNumber(arguments[1])||(arguments[1] instanceof Array)||arguments[1].tagName){this._children(g,arguments[1])}else{var f=this._attributes(arguments[1]);if(f.length){try{d.innerHTML="<"+b+" "+f+"></"+b+">"}catch(h){}g=d.firstChild||null;if(!g){g=document.createElement(b);for(attr in arguments[1]){g[attr=="class"?"className":attr]=arguments[1][attr]}}if(g.tagName.toUpperCase()!=b){g=d.getElementsByTagName(b)[0]}}}}if(arguments[2]){this._children(g,arguments[2])}return $(g)},_text:function(b){return document.createTextNode(b)},ATTR_MAP:{className:"class",htmlFor:"for"},_attributes:function(b){var d=[];for(attribute in b){d.push((attribute in this.ATTR_MAP?this.ATTR_MAP[attribute]:attribute)+'="'+b[attribute].toString().escapeHTML().gsub(/"/,"&quot;")+'"')}return d.join(" ")},_children:function(d,b){if(b.tagName){d.appendChild(b);return}if(typeof b=="object"){b.flatten().each(function(f){if(typeof f=="object"){d.appendChild(f)}else{if(Builder._isStringOrNumber(f)){d.appendChild(Builder._text(f))}}})}else{if(Builder._isStringOrNumber(b)){d.appendChild(Builder._text(b))}}},_isStringOrNumber:function(b){return(typeof b=="string"||typeof b=="number")},build:function(d){var b=this.node("div");$(b).update(d.strip());return b.down()},dump:function(d){if(typeof d!="object"&&typeof d!="function"){d=window}var b=("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/);b.each(function(e){d[e]=function(){return Builder.node.apply(Builder,[e].concat($A(arguments)))}})}};String.prototype.parseColor=function(){var b="#";if(this.slice(0,4)=="rgb("){var e=this.slice(4,this.length-1).split(",");var d=0;do{b+=parseInt(e[d]).toColorPart()}while(++d<3)}else{if(this.slice(0,1)=="#"){if(this.length==4){for(var d=1;d<4;d++){b+=(this.charAt(d)+this.charAt(d)).toLowerCase()}}if(this.length==7){b=this.toLowerCase()}}}return(b.length==7?b:(arguments[0]||this))};Element.collectTextNodes=function(b){return $A($(b).childNodes).collect(function(d){return(d.nodeType==3?d.nodeValue:(d.hasChildNodes()?Element.collectTextNodes(d):""))}).flatten().join("")};Element.collectTextNodesIgnoreClass=function(b,d){return $A($(b).childNodes).collect(function(e){return(e.nodeType==3?e.nodeValue:((e.hasChildNodes()&&!Element.hasClassName(e,d))?Element.collectTextNodesIgnoreClass(e,d):""))}).flatten().join("")};Element.setContentZoom=function(b,d){b=$(b);b.setStyle({fontSize:(d/100)+"em"});if(Prototype.Browser.WebKit){window.scrollBy(0,0)}return b};Element.getInlineOpacity=function(b){return $(b).style.opacity||""};Element.forceRerendering=function(b){try{b=$(b);var f=document.createTextNode(" ");b.appendChild(f);b.removeChild(f)}catch(d){}};var Effect={_elementDoesNotExistError:{name:"ElementDoesNotExistError",message:"The specified DOM element does not exist, but is required for this effect to operate"},Transitions:{linear:Prototype.K,sinoidal:function(b){return(-Math.cos(b*Math.PI)/2)+0.5},reverse:function(b){return 1-b},flicker:function(b){var b=((-Math.cos(b*Math.PI)/4)+0.75)+Math.random()/4;return b>1?1:b},wobble:function(b){return(-Math.cos(b*Math.PI*(9*b))/2)+0.5},pulse:function(d,b){return(-Math.cos((d*((b||5)-0.5)*2)*Math.PI)/2)+0.5},spring:function(b){return 1-(Math.cos(b*4.5*Math.PI)*Math.exp(-b*6))},none:function(b){return 0},full:function(b){return 1}},DefaultOptions:{duration:1,fps:100,sync:false,from:0,to:1,delay:0,queue:"parallel"},tagifyText:function(b){var d="position:relative";if(Prototype.Browser.IE){d+=";zoom:1"}b=$(b);$A(b.childNodes).each(function(e){if(e.nodeType==3){e.nodeValue.toArray().each(function(f){b.insertBefore(new Element("span",{style:d}).update(f==" "?String.fromCharCode(160):f),e)});Element.remove(e)}})},multiple:function(d,e){var g;if(((typeof d=="object")||Object.isFunction(d))&&(d.length)){g=d}else{g=$(d).childNodes}var b=Object.extend({speed:0.1,delay:0},arguments[2]||{});var f=b.delay;$A(g).each(function(l,h){new e(l,Object.extend(b,{delay:h*b.speed+f}))})},PAIRS:{slide:["SlideDown","SlideUp"],blind:["BlindDown","BlindUp"],appear:["Appear","Fade"]},toggle:function(d,e){d=$(d);e=(e||"appear").toLowerCase();var b=Object.extend({queue:{position:"end",scope:(d.id||"global"),limit:1}},arguments[2]||{});Effect[d.visible()?Effect.PAIRS[e][1]:Effect.PAIRS[e][0]](d,b)}};Effect.DefaultOptions.transition=Effect.Transitions.sinoidal;Effect.ScopedQueue=Class.create(Enumerable,{initialize:function(){this.effects=[];this.interval=null},_each:function(b){this.effects._each(b)},add:function(d){var e=new Date().getTime();var b=Object.isString(d.options.queue)?d.options.queue:d.options.queue.position;switch(b){case"front":this.effects.findAll(function(f){return f.state=="idle"}).each(function(f){f.startOn+=d.finishOn;f.finishOn+=d.finishOn});break;case"with-last":e=this.effects.pluck("startOn").max()||e;break;case"end":e=this.effects.pluck("finishOn").max()||e;break}d.startOn+=e;d.finishOn+=e;if(!d.options.queue.limit||(this.effects.length<d.options.queue.limit)){this.effects.push(d)}if(!this.interval){this.interval=setInterval(this.loop.bind(this),15)}},remove:function(b){this.effects=this.effects.reject(function(d){return d==b});if(this.effects.length==0){clearInterval(this.interval);this.interval=null}},loop:function(){var e=new Date().getTime();for(var d=0,b=this.effects.length;d<b;d++){this.effects[d]&&this.effects[d].loop(e)}}});Effect.Queues={instances:$H(),get:function(b){if(!Object.isString(b)){return b}return this.instances.get(b)||this.instances.set(b,new Effect.ScopedQueue())}};Effect.Queue=Effect.Queues.get("global");Effect.Base=Class.create({position:null,start:function(b){function d(f,e){return((f[e+"Internal"]?"this.options."+e+"Internal(this);":"")+(f[e]?"this.options."+e+"(this);":""))}if(b&&b.transition===false){b.transition=Effect.Transitions.linear}this.options=Object.extend(Object.extend({},Effect.DefaultOptions),b||{});this.currentFrame=0;this.state="idle";this.startOn=this.options.delay*1000;this.finishOn=this.startOn+(this.options.duration*1000);this.fromToDelta=this.options.to-this.options.from;this.totalTime=this.finishOn-this.startOn;this.totalFrames=this.options.fps*this.options.duration;this.render=(function(){function e(g,f){if(g.options[f+"Internal"]){g.options[f+"Internal"](g)}if(g.options[f]){g.options[f](g)}}return function(f){if(this.state==="idle"){this.state="running";e(this,"beforeSetup");if(this.setup){this.setup()}e(this,"afterSetup")}if(this.state==="running"){f=(this.options.transition(f)*this.fromToDelta)+this.options.from;this.position=f;e(this,"beforeUpdate");if(this.update){this.update(f)}e(this,"afterUpdate")}}})();this.event("beforeStart");if(!this.options.sync){Effect.Queues.get(Object.isString(this.options.queue)?"global":this.options.queue.scope).add(this)}},loop:function(e){if(e>=this.startOn){if(e>=this.finishOn){this.render(1);this.cancel();this.event("beforeFinish");if(this.finish){this.finish()}this.event("afterFinish");return}var d=(e-this.startOn)/this.totalTime,b=(d*this.totalFrames).round();if(b>this.currentFrame){this.render(d);this.currentFrame=b}}},cancel:function(){if(!this.options.sync){Effect.Queues.get(Object.isString(this.options.queue)?"global":this.options.queue.scope).remove(this)}this.state="finished"},event:function(b){if(this.options[b+"Internal"]){this.options[b+"Internal"](this)}if(this.options[b]){this.options[b](this)}},inspect:function(){var b=$H();for(property in this){if(!Object.isFunction(this[property])){b.set(property,this[property])}}return"#<Effect:"+b.inspect()+",options:"+$H(this.options).inspect()+">"}});Effect.Parallel=Class.create(Effect.Base,{initialize:function(b){this.effects=b||[];this.start(arguments[1])},update:function(b){this.effects.invoke("render",b)},finish:function(b){this.effects.each(function(d){d.render(1);d.cancel();d.event("beforeFinish");if(d.finish){d.finish(b)}d.event("afterFinish")})}});Effect.Tween=Class.create(Effect.Base,{initialize:function(e,h,g){e=Object.isString(e)?$(e):e;var d=$A(arguments),f=d.last(),b=d.length==5?d[3]:null;this.method=Object.isFunction(f)?f.bind(e):Object.isFunction(e[f])?e[f].bind(e):function(l){e[f]=l};this.start(Object.extend({from:h,to:g},b||{}))},update:function(b){this.method(b)}});Effect.Event=Class.create(Effect.Base,{initialize:function(){this.start(Object.extend({duration:0},arguments[0]||{}))},update:Prototype.emptyFunction});Effect.Opacity=Class.create(Effect.Base,{initialize:function(d){this.element=$(d);if(!this.element){throw (Effect._elementDoesNotExistError)}if(Prototype.Browser.IE&&(!this.element.currentStyle.hasLayout)){this.element.setStyle({zoom:1})}var b=Object.extend({from:this.element.getOpacity()||0,to:1},arguments[1]||{});this.start(b)},update:function(b){this.element.setOpacity(b)}});Effect.Move=Class.create(Effect.Base,{initialize:function(d){this.element=$(d);if(!this.element){throw (Effect._elementDoesNotExistError)}var b=Object.extend({x:0,y:0,mode:"relative"},arguments[1]||{});this.start(b)},setup:function(){this.element.makePositioned();this.originalLeft=parseFloat(this.element.getStyle("left")||"0");this.originalTop=parseFloat(this.element.getStyle("top")||"0");if(this.options.mode=="absolute"){this.options.x=this.options.x-this.originalLeft;this.options.y=this.options.y-this.originalTop}},update:function(b){this.element.setStyle({left:(this.options.x*b+this.originalLeft).round()+"px",top:(this.options.y*b+this.originalTop).round()+"px"})}});Effect.MoveBy=function(d,b,e){return new Effect.Move(d,Object.extend({x:e,y:b},arguments[3]||{}))};Effect.Scale=Class.create(Effect.Base,{initialize:function(d,e){this.element=$(d);if(!this.element){throw (Effect._elementDoesNotExistError)}var b=Object.extend({scaleX:true,scaleY:true,scaleContent:true,scaleFromCenter:false,scaleMode:"box",scaleFrom:100,scaleTo:e},arguments[2]||{});this.start(b)},setup:function(){this.restoreAfterFinish=this.options.restoreAfterFinish||false;this.elementPositioning=this.element.getStyle("position");this.originalStyle={};["top","left","width","height","fontSize"].each(function(d){this.originalStyle[d]=this.element.style[d]}.bind(this));this.originalTop=this.element.offsetTop;this.originalLeft=this.element.offsetLeft;var b=this.element.getStyle("font-size")||"100%";["em","px","%","pt"].each(function(d){if(b.indexOf(d)>0){this.fontSize=parseFloat(b);this.fontSizeType=d}}.bind(this));this.factor=(this.options.scaleTo-this.options.scaleFrom)/100;this.dims=null;if(this.options.scaleMode=="box"){this.dims=[this.element.offsetHeight,this.element.offsetWidth]}if(/^content/.test(this.options.scaleMode)){this.dims=[this.element.scrollHeight,this.element.scrollWidth]}if(!this.dims){this.dims=[this.options.scaleMode.originalHeight,this.options.scaleMode.originalWidth]}},update:function(b){var d=(this.options.scaleFrom/100)+(this.factor*b);if(this.options.scaleContent&&this.fontSize){this.element.setStyle({fontSize:this.fontSize*d+this.fontSizeType})}this.setDimensions(this.dims[0]*d,this.dims[1]*d)},finish:function(b){if(this.restoreAfterFinish){this.element.setStyle(this.originalStyle)}},setDimensions:function(b,g){var h={};if(this.options.scaleX){h.width=g.round()+"px"}if(this.options.scaleY){h.height=b.round()+"px"}if(this.options.scaleFromCenter){var f=(b-this.dims[0])/2;var e=(g-this.dims[1])/2;if(this.elementPositioning=="absolute"){if(this.options.scaleY){h.top=this.originalTop-f+"px"}if(this.options.scaleX){h.left=this.originalLeft-e+"px"}}else{if(this.options.scaleY){h.top=-f+"px"}if(this.options.scaleX){h.left=-e+"px"}}}this.element.setStyle(h)}});Effect.Highlight=Class.create(Effect.Base,{initialize:function(d){this.element=$(d);if(!this.element){throw (Effect._elementDoesNotExistError)}var b=Object.extend({startcolor:"#ffff99"},arguments[1]||{});this.start(b)},setup:function(){if(this.element.getStyle("display")=="none"){this.cancel();return}this.oldStyle={};if(!this.options.keepBackgroundImage){this.oldStyle.backgroundImage=this.element.getStyle("background-image");this.element.setStyle({backgroundImage:"none"})}if(!this.options.endcolor){this.options.endcolor=this.element.getStyle("background-color").parseColor("#ffffff")}if(!this.options.restorecolor){this.options.restorecolor=this.element.getStyle("background-color")}this._base=$R(0,2).map(function(b){return parseInt(this.options.startcolor.slice(b*2+1,b*2+3),16)}.bind(this));this._delta=$R(0,2).map(function(b){return parseInt(this.options.endcolor.slice(b*2+1,b*2+3),16)-this._base[b]}.bind(this))},update:function(b){this.element.setStyle({backgroundColor:$R(0,2).inject("#",function(d,e,f){return d+((this._base[f]+(this._delta[f]*b)).round().toColorPart())}.bind(this))})},finish:function(){this.element.setStyle(Object.extend(this.oldStyle,{backgroundColor:this.options.restorecolor}))}});Effect.ScrollTo=function(e){var d=arguments[1]||{},b=document.viewport.getScrollOffsets(),f=$(e).cumulativeOffset();if(d.offset){f[1]+=d.offset}return new Effect.Tween(null,b.top,f[1],d,function(g){scrollTo(b.left,g.round())})};Effect.Fade=function(e){e=$(e);var b=e.getInlineOpacity();var d=Object.extend({from:e.getOpacity()||1,to:0,afterFinishInternal:function(f){if(f.options.to!=0){return}f.element.hide().setStyle({opacity:b})}},arguments[1]||{});return new Effect.Opacity(e,d)};Effect.Appear=function(d){d=$(d);var b=Object.extend({from:(d.getStyle("display")=="none"?0:d.getOpacity()||0),to:1,afterFinishInternal:function(e){e.element.forceRerendering()},beforeSetup:function(e){e.element.setOpacity(e.options.from).show()}},arguments[1]||{});return new Effect.Opacity(d,b)};Effect.Puff=function(d){d=$(d);var b={opacity:d.getInlineOpacity(),position:d.getStyle("position"),top:d.style.top,left:d.style.left,width:d.style.width,height:d.style.height};return new Effect.Parallel([new Effect.Scale(d,200,{sync:true,scaleFromCenter:true,scaleContent:true,restoreAfterFinish:true}),new Effect.Opacity(d,{sync:true,to:0})],Object.extend({duration:1,beforeSetupInternal:function(e){Position.absolutize(e.effects[0].element)},afterFinishInternal:function(e){e.effects[0].element.hide().setStyle(b)}},arguments[1]||{}))};Effect.BlindUp=function(b){b=$(b);b.makeClipping();return new Effect.Scale(b,0,Object.extend({scaleContent:false,scaleX:false,restoreAfterFinish:true,afterFinishInternal:function(d){d.element.hide().undoClipping()}},arguments[1]||{}))};Effect.BlindDown=function(d){d=$(d);var b=d.getDimensions();return new Effect.Scale(d,100,Object.extend({scaleContent:false,scaleX:false,scaleFrom:0,scaleMode:{originalHeight:b.height,originalWidth:b.width},restoreAfterFinish:true,afterSetup:function(e){e.element.makeClipping().setStyle({height:"0px"}).show()},afterFinishInternal:function(e){e.element.undoClipping()}},arguments[1]||{}))};Effect.SwitchOff=function(d){d=$(d);var b=d.getInlineOpacity();return new Effect.Appear(d,Object.extend({duration:0.4,from:0,transition:Effect.Transitions.flicker,afterFinishInternal:function(e){new Effect.Scale(e.element,1,{duration:0.3,scaleFromCenter:true,scaleX:false,scaleContent:false,restoreAfterFinish:true,beforeSetup:function(f){f.element.makePositioned().makeClipping()},afterFinishInternal:function(f){f.element.hide().undoClipping().undoPositioned().setStyle({opacity:b})}})}},arguments[1]||{}))};Effect.DropOut=function(d){d=$(d);var b={top:d.getStyle("top"),left:d.getStyle("left"),opacity:d.getInlineOpacity()};return new Effect.Parallel([new Effect.Move(d,{x:0,y:100,sync:true}),new Effect.Opacity(d,{sync:true,to:0})],Object.extend({duration:0.5,beforeSetup:function(e){e.effects[0].element.makePositioned()},afterFinishInternal:function(e){e.effects[0].element.hide().undoPositioned().setStyle(b)}},arguments[1]||{}))};Effect.Shake=function(f){f=$(f);var d=Object.extend({distance:20,duration:0.5},arguments[1]||{});var g=parseFloat(d.distance);var e=parseFloat(d.duration)/10;var b={top:f.getStyle("top"),left:f.getStyle("left")};return new Effect.Move(f,{x:g,y:0,duration:e,afterFinishInternal:function(h){new Effect.Move(h.element,{x:-g*2,y:0,duration:e*2,afterFinishInternal:function(l){new Effect.Move(l.element,{x:g*2,y:0,duration:e*2,afterFinishInternal:function(n){new Effect.Move(n.element,{x:-g*2,y:0,duration:e*2,afterFinishInternal:function(o){new Effect.Move(o.element,{x:g*2,y:0,duration:e*2,afterFinishInternal:function(p){new Effect.Move(p.element,{x:-g,y:0,duration:e,afterFinishInternal:function(q){q.element.undoPositioned().setStyle(b)}})}})}})}})}})}})};Effect.SlideDown=function(e){e=$(e).cleanWhitespace();var b=e.down().getStyle("bottom");var d=e.getDimensions();return new Effect.Scale(e,100,Object.extend({scaleContent:false,scaleX:false,scaleFrom:window.opera?0:1,scaleMode:{originalHeight:d.height,originalWidth:d.width},restoreAfterFinish:true,afterSetup:function(f){f.element.makePositioned();f.element.down().makePositioned();if(window.opera){f.element.setStyle({top:""})}f.element.makeClipping().setStyle({height:"0px"}).show()},afterUpdateInternal:function(f){f.element.down().setStyle({bottom:(f.dims[0]-f.element.clientHeight)+"px"})},afterFinishInternal:function(f){f.element.undoClipping().undoPositioned();f.element.down().undoPositioned().setStyle({bottom:b})}},arguments[1]||{}))};Effect.SlideUp=function(e){e=$(e).cleanWhitespace();var b=e.down().getStyle("bottom");var d=e.getDimensions();return new Effect.Scale(e,window.opera?0:1,Object.extend({scaleContent:false,scaleX:false,scaleMode:"box",scaleFrom:100,scaleMode:{originalHeight:d.height,originalWidth:d.width},restoreAfterFinish:true,afterSetup:function(f){f.element.makePositioned();f.element.down().makePositioned();if(window.opera){f.element.setStyle({top:""})}f.element.makeClipping().show()},afterUpdateInternal:function(f){f.element.down().setStyle({bottom:(f.dims[0]-f.element.clientHeight)+"px"})},afterFinishInternal:function(f){f.element.hide().undoClipping().undoPositioned();f.element.down().undoPositioned().setStyle({bottom:b})}},arguments[1]||{}))};Effect.Squish=function(b){return new Effect.Scale(b,window.opera?1:0,{restoreAfterFinish:true,beforeSetup:function(d){d.element.makeClipping()},afterFinishInternal:function(d){d.element.hide().undoClipping()}})};Effect.Grow=function(e){e=$(e);var d=Object.extend({direction:"center",moveTransition:Effect.Transitions.sinoidal,scaleTransition:Effect.Transitions.sinoidal,opacityTransition:Effect.Transitions.full},arguments[1]||{});var b={top:e.style.top,left:e.style.left,height:e.style.height,width:e.style.width,opacity:e.getInlineOpacity()};var l=e.getDimensions();var n,h;var g,f;switch(d.direction){case"top-left":n=h=g=f=0;break;case"top-right":n=l.width;h=f=0;g=-l.width;break;case"bottom-left":n=g=0;h=l.height;f=-l.height;break;case"bottom-right":n=l.width;h=l.height;g=-l.width;f=-l.height;break;case"center":n=l.width/2;h=l.height/2;g=-l.width/2;f=-l.height/2;break}return new Effect.Move(e,{x:n,y:h,duration:0.01,beforeSetup:function(o){o.element.hide().makeClipping().makePositioned()},afterFinishInternal:function(o){new Effect.Parallel([new Effect.Opacity(o.element,{sync:true,to:1,from:0,transition:d.opacityTransition}),new Effect.Move(o.element,{x:g,y:f,sync:true,transition:d.moveTransition}),new Effect.Scale(o.element,100,{scaleMode:{originalHeight:l.height,originalWidth:l.width},sync:true,scaleFrom:window.opera?1:0,transition:d.scaleTransition,restoreAfterFinish:true})],Object.extend({beforeSetup:function(p){p.effects[0].element.setStyle({height:"0px"}).show()},afterFinishInternal:function(p){p.effects[0].element.undoClipping().undoPositioned().setStyle(b)}},d))}})};Effect.Shrink=function(e){e=$(e);var d=Object.extend({direction:"center",moveTransition:Effect.Transitions.sinoidal,scaleTransition:Effect.Transitions.sinoidal,opacityTransition:Effect.Transitions.none},arguments[1]||{});var b={top:e.style.top,left:e.style.left,height:e.style.height,width:e.style.width,opacity:e.getInlineOpacity()};var h=e.getDimensions();var g,f;switch(d.direction){case"top-left":g=f=0;break;case"top-right":g=h.width;f=0;break;case"bottom-left":g=0;f=h.height;break;case"bottom-right":g=h.width;f=h.height;break;case"center":g=h.width/2;f=h.height/2;break}return new Effect.Parallel([new Effect.Opacity(e,{sync:true,to:0,from:1,transition:d.opacityTransition}),new Effect.Scale(e,window.opera?1:0,{sync:true,transition:d.scaleTransition,restoreAfterFinish:true}),new Effect.Move(e,{x:g,y:f,sync:true,transition:d.moveTransition})],Object.extend({beforeStartInternal:function(l){l.effects[0].element.makePositioned().makeClipping()},afterFinishInternal:function(l){l.effects[0].element.hide().undoClipping().undoPositioned().setStyle(b)}},d))};Effect.Pulsate=function(e){e=$(e);var d=arguments[1]||{},b=e.getInlineOpacity(),g=d.transition||Effect.Transitions.linear,f=function(h){return 1-g((-Math.cos((h*(d.pulses||5)*2)*Math.PI)/2)+0.5)};return new Effect.Opacity(e,Object.extend(Object.extend({duration:2,from:0,afterFinishInternal:function(h){h.element.setStyle({opacity:b})}},d),{transition:f}))};Effect.Fold=function(d){d=$(d);var b={top:d.style.top,left:d.style.left,width:d.style.width,height:d.style.height};d.makeClipping();return new Effect.Scale(d,5,Object.extend({scaleContent:false,scaleX:false,afterFinishInternal:function(e){new Effect.Scale(d,1,{scaleContent:false,scaleY:false,afterFinishInternal:function(f){f.element.hide().undoClipping().setStyle(b)}})}},arguments[1]||{}))};Effect.Morph=Class.create(Effect.Base,{initialize:function(e){this.element=$(e);if(!this.element){throw (Effect._elementDoesNotExistError)}var b=Object.extend({style:{}},arguments[1]||{});if(!Object.isString(b.style)){this.style=$H(b.style)}else{if(b.style.include(":")){this.style=b.style.parseStyle()}else{this.element.addClassName(b.style);this.style=$H(this.element.getStyles());this.element.removeClassName(b.style);var d=this.element.getStyles();this.style=this.style.reject(function(f){return f.value==d[f.key]});b.afterFinishInternal=function(f){f.element.addClassName(f.options.style);f.transforms.each(function(g){f.element.style[g.style]=""})}}}this.start(b)},setup:function(){function b(d){if(!d||["rgba(0, 0, 0, 0)","transparent"].include(d)){d="#ffffff"}d=d.parseColor();return $R(0,2).map(function(e){return parseInt(d.slice(e*2+1,e*2+3),16)})}this.transforms=this.style.map(function(l){var h=l[0],g=l[1],f=null;if(g.parseColor("#zzzzzz")!="#zzzzzz"){g=g.parseColor();f="color"}else{if(h=="opacity"){g=parseFloat(g);if(Prototype.Browser.IE&&(!this.element.currentStyle.hasLayout)){this.element.setStyle({zoom:1})}}else{if(Element.CSS_LENGTH.test(g)){var e=g.match(/^([\+\-]?[0-9\.]+)(.*)$/);g=parseFloat(e[1]);f=(e.length==3)?e[2]:null}}}var d=this.element.getStyle(h);return{style:h.camelize(),originalValue:f=="color"?b(d):parseFloat(d||0),targetValue:f=="color"?b(g):g,unit:f}}.bind(this)).reject(function(d){return((d.originalValue==d.targetValue)||(d.unit!="color"&&(isNaN(d.originalValue)||isNaN(d.targetValue))))})},update:function(b){var f={},d,e=this.transforms.length;while(e--){f[(d=this.transforms[e]).style]=d.unit=="color"?"#"+(Math.round(d.originalValue[0]+(d.targetValue[0]-d.originalValue[0])*b)).toColorPart()+(Math.round(d.originalValue[1]+(d.targetValue[1]-d.originalValue[1])*b)).toColorPart()+(Math.round(d.originalValue[2]+(d.targetValue[2]-d.originalValue[2])*b)).toColorPart():(d.originalValue+(d.targetValue-d.originalValue)*b).toFixed(3)+(d.unit===null?"":d.unit)}this.element.setStyle(f,true)}});Effect.Transform=Class.create({initialize:function(b){this.tracks=[];this.options=arguments[1]||{};this.addTracks(b)},addTracks:function(b){b.each(function(d){d=$H(d);var e=d.values().first();this.tracks.push($H({ids:d.keys().first(),effect:Effect.Morph,options:{style:e}}))}.bind(this));return this},play:function(){return new Effect.Parallel(this.tracks.map(function(b){var f=b.get("ids"),e=b.get("effect"),d=b.get("options");var g=[$(f)||$$(f)].flatten();return g.map(function(h){return new e(h,Object.extend({sync:true},d))})}).flatten(),this.options)}});Element.CSS_PROPERTIES=$w("backgroundColor backgroundPosition borderBottomColor borderBottomStyle borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth borderRightColor borderRightStyle borderRightWidth borderSpacing borderTopColor borderTopStyle borderTopWidth bottom clip color fontSize fontWeight height left letterSpacing lineHeight marginBottom marginLeft marginRight marginTop markerOffset maxHeight maxWidth minHeight minWidth opacity outlineColor outlineOffset outlineWidth paddingBottom paddingLeft paddingRight paddingTop right textIndent top width wordSpacing zIndex");Element.CSS_LENGTH=/^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;String.__parseStyleElement=document.createElement("div");String.prototype.parseStyle=function(){var d,b=$H();if(Prototype.Browser.WebKit){d=new Element("div",{style:this}).style}else{String.__parseStyleElement.innerHTML='<div style="'+this+'"></div>';d=String.__parseStyleElement.childNodes[0].style}Element.CSS_PROPERTIES.each(function(e){if(d[e]){b.set(e,d[e])}});if(Prototype.Browser.IE&&this.include("opacity")){b.set("opacity",this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1])}return b};if(document.defaultView&&document.defaultView.getComputedStyle){Element.getStyles=function(d){var b=document.defaultView.getComputedStyle($(d),null);return Element.CSS_PROPERTIES.inject({},function(e,f){e[f]=b[f];return e})}}else{Element.getStyles=function(d){d=$(d);var b=d.currentStyle,e;e=Element.CSS_PROPERTIES.inject({},function(f,g){f[g]=b[g];return f});if(!e.opacity){e.opacity=d.getOpacity()}return e}}Effect.Methods={morph:function(b,d){b=$(b);new Effect.Morph(b,Object.extend({style:d},arguments[2]||{}));return b},visualEffect:function(e,g,d){e=$(e);var f=g.dasherize().camelize(),b=f.charAt(0).toUpperCase()+f.substring(1);new Effect[b](e,d);return e},highlight:function(d,b){d=$(d);new Effect.Highlight(d,b);return d}};$w("fade appear grow shrink fold blindUp blindDown slideUp slideDown pulsate shake puff squish switchOff dropOut").each(function(b){Effect.Methods[b]=function(e,d){e=$(e);Effect[b.charAt(0).toUpperCase()+b.substring(1)](e,d);return e}});$w("getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles").each(function(b){Effect.Methods[b]=Element[b]});Element.addMethods(Effect.Methods);function validateCreditCard(e){var d="0123456789";var b="";for(i=0;i<e.length;i++){x=e.charAt(i);if(d.indexOf(x,0)!=-1){b+=x}}j=b.length/2;k=Math.floor(j);m=Math.ceil(j)-k;c=0;for(i=0;i<k;i++){a=b.charAt(i*2+m)*2;c+=a>9?Math.floor(a/10+a%10):a}for(i=0;i<k+m;i++){c+=b.charAt(i*2+1-m)*1}return(c%10==0)}var Validator=Class.create();Validator.prototype={initialize:function(e,d,f,b){if(typeof f=="function"){this.options=$H(b);this._test=f}else{this.options=$H(f);this._test=function(){return true}}this.error=d||"Validation failed.";this.className=e},test:function(b,d){return(this._test(b,d)&&this.options.all(function(e){return Validator.methods[e.key]?Validator.methods[e.key](b,d,e.value):true}))}};Validator.methods={pattern:function(b,e,d){return Validation.get("IsEmpty").test(b)||d.test(b)},minLength:function(b,e,d){return b.length>=d},maxLength:function(b,e,d){return b.length<=d},min:function(b,e,d){return b>=parseFloat(d)},max:function(b,e,d){return b<=parseFloat(d)},notOneOf:function(b,e,d){return $A(d).all(function(f){return b!=f})},oneOf:function(b,e,d){return $A(d).any(function(f){return b==f})},is:function(b,e,d){return b==d},isNot:function(b,e,d){return b!=d},equalToField:function(b,e,d){return b==$F(d)},notEqualToField:function(b,e,d){return b!=$F(d)},include:function(b,e,d){return $A(d).all(function(f){return Validation.get(f).test(b,e)})}};var Validation=Class.create();Validation.defaultOptions={onSubmit:true,stopOnFirst:false,immediate:false,focusOnError:true,useTitles:false,addClassNameToContainer:false,containerClassName:".input-box",onFormValidate:function(b,d){},onElementValidate:function(b,d){}};Validation.prototype={initialize:function(d,b){this.form=$(d);if(!this.form){return}this.options=Object.extend({onSubmit:Validation.defaultOptions.onSubmit,stopOnFirst:Validation.defaultOptions.stopOnFirst,immediate:Validation.defaultOptions.immediate,focusOnError:Validation.defaultOptions.focusOnError,useTitles:Validation.defaultOptions.useTitles,onFormValidate:Validation.defaultOptions.onFormValidate,onElementValidate:Validation.defaultOptions.onElementValidate},b||{});if(this.options.onSubmit){Event.observe(this.form,"submit",this.onSubmit.bind(this),false)}if(this.options.immediate){Form.getElements(this.form).each(function(e){if(e.tagName.toLowerCase()=="select"){Event.observe(e,"blur",this.onChange.bindAsEventListener(this))}if(e.type.toLowerCase()=="radio"||e.type.toLowerCase()=="checkbox"){Event.observe(e,"click",this.onChange.bindAsEventListener(this))}else{Event.observe(e,"change",this.onChange.bindAsEventListener(this))}},this)}},onChange:function(b){Validation.isOnChange=true;Validation.validate(Event.element(b),{useTitle:this.options.useTitles,onElementValidate:this.options.onElementValidate});Validation.isOnChange=false},onSubmit:function(b){if(!this.validate()){Event.stop(b)}},validate:function(){var b=false;var d=this.options.useTitles;var g=this.options.onElementValidate;try{if(this.options.stopOnFirst){b=Form.getElements(this.form).all(function(e){if(e.hasClassName("local-validation")&&!this.isElementInForm(e,this.form)){return true}return Validation.validate(e,{useTitle:d,onElementValidate:g})},this)}else{b=Form.getElements(this.form).collect(function(e){if(e.hasClassName("local-validation")&&!this.isElementInForm(e,this.form)){return true}if(e.hasClassName("validation-disabled")){return true}return Validation.validate(e,{useTitle:d,onElementValidate:g})},this).all()}}catch(f){}if(!b&&this.options.focusOnError){try{Form.getElements(this.form).findAll(function(e){return $(e).hasClassName("validation-failed")}).first().focus()}catch(f){}}this.options.onFormValidate(b,this.form);return b},reset:function(){Form.getElements(this.form).each(Validation.reset)},isElementInForm:function(e,d){var b=e.up("form");if(b==d){return true}return false}};Object.extend(Validation,{validate:function(e,b){b=Object.extend({useTitle:false,onElementValidate:function(f,g){}},b||{});e=$(e);var d=$w(e.className);return result=d.all(function(f){var g=Validation.test(f,e,b.useTitle);b.onElementValidate(g,e);return g})},insertAdvice:function(f,d){var b=$(f).up(".field-row");if(b){Element.insert(b,{after:d})}else{if(f.up("td.value")){f.up("td.value").insert({bottom:d})}else{if(f.advaiceContainer&&$(f.advaiceContainer)){$(f.advaiceContainer).update(d)}else{switch(f.type.toLowerCase()){case"checkbox":case"radio":var e=f.parentNode;if(e){Element.insert(e,{bottom:d})}else{Element.insert(f,{after:d})}break;default:Element.insert(f,{after:d})}}}}},showAdvice:function(e,d,b){if(!e.advices){e.advices=new Hash()}else{e.advices.each(function(f){if(!d||f.value.id!=d.id){this.hideAdvice(e,f.value)}}.bind(this))}e.advices.set(b,d);if(typeof Effect=="undefined"){d.style.display="block"}else{if(!d._adviceAbsolutize){new Effect.Appear(d,{duration:1})}else{Position.absolutize(d);d.show();d.setStyle({top:d._adviceTop,left:d._adviceLeft,width:d._adviceWidth,"z-index":1000});d.addClassName("advice-absolute")}}},hideAdvice:function(d,b){if(b!=null){new Effect.Fade(b,{duration:1,afterFinishInternal:function(){b.hide()}})}},updateCallback:function(elm,status){if(typeof elm.callbackFunction!="undefined"){eval(elm.callbackFunction+"('"+elm.id+"','"+status+"')")}},ajaxError:function(g,f){var e="validate-ajax";var d=Validation.getAdvice(e,g);if(d==null){d=this.createAdvice(e,g,false,f)}this.showAdvice(g,d,"validate-ajax");this.updateCallback(g,"failed");g.addClassName("validation-failed");g.addClassName("validate-ajax");if(Validation.defaultOptions.addClassNameToContainer&&Validation.defaultOptions.containerClassName!=""){var b=g.up(Validation.defaultOptions.containerClassName);if(b&&this.allowContainerClassName(g)){b.removeClassName("validation-passed");b.addClassName("validation-error")}}},allowContainerClassName:function(b){if(b.type=="radio"||b.type=="checkbox"){return b.hasClassName("change-container-classname")}return true},test:function(g,o,l){var d=Validation.get(g);var n="__advice"+g.camelize();try{if(Validation.isVisible(o)&&!d.test($F(o),o)){var f=Validation.getAdvice(g,o);if(f==null){f=this.createAdvice(g,o,l)}this.showAdvice(o,f,g);this.updateCallback(o,"failed");o[n]=1;if(!o.advaiceContainer){o.removeClassName("validation-passed");o.addClassName("validation-failed")}if(Validation.defaultOptions.addClassNameToContainer&&Validation.defaultOptions.containerClassName!=""){var b=o.up(Validation.defaultOptions.containerClassName);if(b&&this.allowContainerClassName(o)){b.removeClassName("validation-passed");b.addClassName("validation-error")}}return false}else{var f=Validation.getAdvice(g,o);this.hideAdvice(o,f);this.updateCallback(o,"passed");o[n]="";o.removeClassName("validation-failed");o.addClassName("validation-passed");if(Validation.defaultOptions.addClassNameToContainer&&Validation.defaultOptions.containerClassName!=""){var b=o.up(Validation.defaultOptions.containerClassName);if(b&&!b.down(".validation-failed")&&this.allowContainerClassName(o)){if(!Validation.get("IsEmpty").test(o.value)||!this.isVisible(o)){b.addClassName("validation-passed")}else{b.removeClassName("validation-passed")}b.removeClassName("validation-error")}}return true}}catch(h){throw (h)}},isVisible:function(b){while(b.tagName!="BODY"){if(!$(b).visible()){return false}b=b.parentNode}return true},getAdvice:function(b,d){return $("advice-"+b+"-"+Validation.getElmID(d))||$("advice-"+Validation.getElmID(d))},createAdvice:function(e,n,l,d){var b=Validation.get(e);var h=l?((n&&n.title)?n.title:b.error):b.error;if(d){h=d}if(jQuery.mage.__){h=jQuery.mage.__(h)}advice='<div class="validation-advice" id="advice-'+e+"-"+Validation.getElmID(n)+'" style="display:none">'+h+"</div>";Validation.insertAdvice(n,advice);advice=Validation.getAdvice(e,n);if($(n).hasClassName("absolute-advice")){var g=$(n).getDimensions();var f=Position.cumulativeOffset(n);advice._adviceTop=(f[1]+g.height)+"px";advice._adviceLeft=(f[0])+"px";advice._adviceWidth=(g.width)+"px";advice._adviceAbsolutize=true}return advice},getElmID:function(b){return b.id?b.id:b.name},reset:function(d){d=$(d);var b=$w(d.className);b.each(function(g){var h="__advice"+g.camelize();if(d[h]){var f=Validation.getAdvice(g,d);if(f){f.hide()}d[h]=""}d.removeClassName("validation-failed");d.removeClassName("validation-passed");if(Validation.defaultOptions.addClassNameToContainer&&Validation.defaultOptions.containerClassName!=""){var e=d.up(Validation.defaultOptions.containerClassName);if(e){e.removeClassName("validation-passed");e.removeClassName("validation-error")}}})},add:function(f,e,g,d){var b={};b[f]=new Validator(f,e,g,d);Object.extend(Validation.methods,b)},addAllThese:function(b){var d={};$A(b).each(function(e){d[e[0]]=new Validator(e[0],e[1],e[2],(e.length>3?e[3]:{}))});Object.extend(Validation.methods,d)},get:function(b){return Validation.methods[b]?Validation.methods[b]:Validation.methods._LikeNoIDIEverSaw_},methods:{_LikeNoIDIEverSaw_:new Validator("_LikeNoIDIEverSaw_","",{})}});Validation.add("IsEmpty","",function(b){return(b==""||(b==null)||(b.length==0)||/^\s+$/.test(b))});Validation.addAllThese([["validate-no-html-tags","HTML tags are not allowed",function(b){return !/<(\/)?\w+/.test(b)}],["validate-select","Please select an option.",function(b){return((b!="none")&&(b!=null)&&(b.length!=0))}],["required-entry","This is a required field.",function(b){return !Validation.get("IsEmpty").test(b)}],["validate-number","Please enter a valid number in this field.",function(b){return Validation.get("IsEmpty").test(b)||(!isNaN(parseNumber(b))&&/^\s*-?\d*(\.\d*)?\s*$/.test(b))}],["validate-number-range","The value is not within the specified range.",function(e,g){if(Validation.get("IsEmpty").test(e)){return true}var f=parseNumber(e);if(isNaN(f)){return false}var d=/^number-range-(-?[\d.,]+)?-(-?[\d.,]+)?$/,b=true;$w(g.className).each(function(l){var h=d.exec(l);if(h){b=b&&(h[1]==null||h[1]==""||f>=parseNumber(h[1]))&&(h[2]==null||h[2]==""||f<=parseNumber(h[2]))}});return b}],["validate-digits","Please use numbers only in this field. Please avoid spaces or other characters such as dots or commas.",function(b){return Validation.get("IsEmpty").test(b)||!/[^\d]/.test(b)}],["validate-digits-range","The value is not within the specified range.",function(e,g){if(Validation.get("IsEmpty").test(e)){return true}var f=parseNumber(e);if(isNaN(f)){return false}var d=/^digits-range-(-?\d+)?-(-?\d+)?$/,b=true;$w(g.className).each(function(l){var h=d.exec(l);if(h){b=b&&(h[1]==null||h[1]==""||f>=parseNumber(h[1]))&&(h[2]==null||h[2]==""||f<=parseNumber(h[2]))}});return b}],["validate-range","The value is not within the specified range.",function(f,l){var g,h;if(Validation.get("IsEmpty").test(f)){return true}else{if(Validation.get("validate-digits").test(f)){g=h=parseNumber(f)}else{var e=/^(-?\d+)?-(-?\d+)?$/.exec(f);if(e){g=parseNumber(e[1]);h=parseNumber(e[2]);if(g>h){return false}}else{return false}}}var d=/^range-(-?\d+)?-(-?\d+)?$/,b=true;$w(l.className).each(function(n){var q=d.exec(n);if(q){var p=parseNumber(q[1]);var o=parseNumber(q[2]);b=b&&(isNaN(p)||g>=p)&&(isNaN(o)||h<=o)}});return b}],["validate-alpha","Please use letters only (a-z or A-Z) in this field.",function(b){return Validation.get("IsEmpty").test(b)||/^[a-zA-Z]+$/.test(b)}],["validate-code","Please use only letters (a-z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.",function(b){return Validation.get("IsEmpty").test(b)||/^[a-z]+[a-z0-9_]+$/.test(b)}],["validate-alphanum","Please use only letters (a-z or A-Z) or numbers (0-9) in this field. No spaces or other characters are allowed.",function(b){return Validation.get("IsEmpty").test(b)||/^[a-zA-Z0-9]+$/.test(b)}],["validate-alphanum-with-spaces","Please use only letters (a-z or A-Z), numbers (0-9) or spaces only in this field.",function(b){return Validation.get("IsEmpty").test(b)||/^[a-zA-Z0-9 ]+$/.test(b)}],["validate-street",'Please use only letters (a-z or A-Z), numbers (0-9), spaces and "#" in this field.',function(b){return Validation.get("IsEmpty").test(b)||/^[ \w]{3,}([A-Za-z]\.)?([ \w]*\#\d+)?(\r\n| )[ \w]{3,}/.test(b)}],["validate-phoneStrict","Please enter a valid phone number (Ex: 123-456-7890).",function(b){return Validation.get("IsEmpty").test(b)||/^(\()?\d{3}(\))?(-|\s)?\d{3}(-|\s)\d{4}$/.test(b)}],["validate-phoneLax","Please enter a valid phone number (Ex: 123-456-7890).",function(b){return Validation.get("IsEmpty").test(b)||/^((\d[-. ]?)?((\(\d{3}\))|\d{3}))?[-. ]?\d{3}[-. ]?\d{4}$/.test(b)}],["validate-fax","Please enter a valid fax number (Ex: 123-456-7890).",function(b){return Validation.get("IsEmpty").test(b)||/^(\()?\d{3}(\))?(-|\s)?\d{3}(-|\s)\d{4}$/.test(b)}],["validate-date","Please enter a valid date.",function(b){var d=new Date(b);return Validation.get("IsEmpty").test(b)||!isNaN(d)}],["validate-date-range","Make sure the To Date is later than or the same as the From Date.",function(e,h){var d=/\bdate-range-(\w+)-(\w+)\b/.exec(h.className);if(!d||d[2]=="to"||Validation.get("IsEmpty").test(e)){return true}var f=new Date().getFullYear()+"";var b=function(l){l=l.split(/[.\/]/);if(l[2]&&l[2].length<4){l[2]=f.substr(0,l[2].length)+l[2]}return new Date(l.join("/")).getTime()};var g=Element.select(h.form,".validate-date-range.date-range-"+d[1]+"-to");return !g.length||Validation.get("IsEmpty").test(g[0].value)||b(e)<=b(g[0].value)}],["validate-email","Please enter a valid email address (Ex: johndoe@domain.com).",function(b){return Validation.get("IsEmpty").test(b)||/^([a-z0-9,!\#\$%&'\*\+\/=\?\^_`\{\|\}~-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z0-9,!\#\$%&'\*\+\/=\?\^_`\{\|\}~-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*@([a-z0-9-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z0-9-]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*\.(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]){2,})$/i.test(b)}],["validate-emailSender","Please use only visible characters and spaces.",function(b){return Validation.get("IsEmpty").test(b)||/^[\S ]+$/.test(b)}],["validate-password","Please enter 6 or more characters. Leading and trailing spaces will be ignored.",function(b){var d=b.strip();return !(d.length>0&&d.length<6)}],["validate-admin-password","Please enter 7 or more characters, using both numeric and alphabetic.",function(b){var d=b.strip();if(0==d.length){return true}if(!(/[a-z]/i.test(b))||!(/[0-9]/.test(b))){return false}return !(d.length<7)}],["validate-cpassword","Please make sure your passwords match.",function(b){var d=$("confirmation")?$("confirmation"):$$(".validate-cpassword")[0];var g=false;if($("password")){g=$("password")}var h=$$(".validate-password");for(var e=0;e<h.size();e++){var f=h[e];if(f.up("form").id==d.up("form").id){g=f}}if($$(".validate-admin-password").size()){g=$$(".validate-admin-password")[0]}return(g.value==d.value)}],["validate-both-passwords","Please make sure your passwords match.",function(e,d){var b=$(d.form[d.name=="password"?"confirmation":"password"]),f=d.value==b.value;if(f&&b.hasClassName("validation-failed")){Validation.test(this.className,b)}return b.value==""||f}],["validate-url","Please enter a valid URL. Protocol is required (http://, https:// or ftp://)",function(b){b=(b||"").replace(/^\s+/,"").replace(/\s+$/,"");return Validation.get("IsEmpty").test(b)||/^(http|https|ftp):\/\/(([A-Z0-9]([A-Z0-9_-]*[A-Z0-9]|))(\.[A-Z0-9]([A-Z0-9_-]*[A-Z0-9]|))*)(:(\d+))?(\/[A-Z0-9~](([A-Z0-9_~-]|\.)*[A-Z0-9~]|))*\/?(.*)?$/i.test(b)}],["validate-clean-url",'Please enter a valid URL (Ex: "http://www.example.com" or "www.example.com").',function(b){return Validation.get("IsEmpty").test(b)||/^(http|https|ftp):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+.(com|org|net|dk|at|us|tv|info|uk|co.uk|biz|se)$)(:(\d+))?\/?/i.test(b)||/^(www)((\.[A-Z0-9][A-Z0-9_-]*)+.(com|org|net|dk|at|us|tv|info|uk|co.uk|biz|se)$)(:(\d+))?\/?/i.test(b)}],["validate-identifier",'Please enter a valid URL Key (Ex: "example-page", "example-page.html" or "anotherlevel/example-page").',function(b){return Validation.get("IsEmpty").test(b)||/^[a-z0-9][a-z0-9_\/-]+(\.[a-z0-9_-]+)?$/.test(b)}],["validate-xml-identifier","Please enter a valid XML-identifier (Ex: something_1, block5, id-4).",function(b){return Validation.get("IsEmpty").test(b)||/^[A-Z][A-Z0-9_\/-]*$/i.test(b)}],["validate-ssn","Please enter a valid social security number (Ex: 123-45-6789).",function(b){return Validation.get("IsEmpty").test(b)||/^\d{3}-?\d{2}-?\d{4}$/.test(b)}],["validate-zip-us","Please enter a valid zip code (Ex: 90602 or 90602-1234).",function(b){return Validation.get("IsEmpty").test(b)||/(^\d{5}$)|(^\d{5}-\d{4}$)/.test(b)}],["validate-zip-international","Please enter a valid zip code.",function(b){return true}],["validate-date-au",'Please use this date format: dd/mm/yyyy (Ex: "17/03/2006" for the 17th of March, 2006).',function(b){if(Validation.get("IsEmpty").test(b)){return true}var e=/^(\d{2})\/(\d{2})\/(\d{4})$/;if(!e.test(b)){return false}var f=new Date(b.replace(e,"$2/$1/$3"));return(parseInt(RegExp.$2,10)==(1+f.getMonth()))&&(parseInt(RegExp.$1,10)==f.getDate())&&(parseInt(RegExp.$3,10)==f.getFullYear())}],["validate-currency-dollar","Please enter a valid $ amount (Ex: $100.00).",function(b){return Validation.get("IsEmpty").test(b)||/^\$?\-?([1-9]{1}[0-9]{0,2}(\,[0-9]{3})*(\.[0-9]{0,2})?|[1-9]{1}\d*(\.[0-9]{0,2})?|0(\.[0-9]{0,2})?|(\.[0-9]{1,2})?)$/.test(b)}],["validate-one-required","Please select one of the options above.",function(b,f){var e=f.parentNode;var d=e.getElementsByTagName("INPUT");return $A(d).any(function(g){return $F(g)})}],["validate-one-required-by-name","Please select one of the options.",function(d,g){var b=$$('input[name="'+g.name.replace(/([\\"])/g,"\\$1")+'"]');var e=1;for(var f=0;f<b.length;f++){if((b[f].type=="checkbox"||b[f].type=="radio")&&b[f].checked==true){e=0}if(Validation.isOnChange&&(b[f].type=="checkbox"||b[f].type=="radio")){Validation.reset(b[f])}}if(e==0){return true}else{return false}}],["validate-not-negative-number","Please enter a number 0 or greater in this field.",function(b){if(Validation.get("IsEmpty").test(b)){return true}b=parseNumber(b);return !isNaN(b)&&b>=0}],["validate-zero-or-greater","Please enter a number 0 or greater in this field.",function(b){return Validation.get("validate-not-negative-number").test(b)}],["validate-greater-than-zero","Please enter a number greater than 0 in this field.",function(b){if(Validation.get("IsEmpty").test(b)){return true}b=parseNumber(b);return !isNaN(b)&&b>0}],["validate-state","Please select State/Province.",function(b){return(b!=0||b=="")}],["validate-new-password","Please enter 6 or more characters. Leading and trailing spaces will be ignored.",function(b){if(!Validation.get("validate-password").test(b)){return false}if(Validation.get("IsEmpty").test(b)&&b!=""){return false}return true}],["validate-cc-number","Please enter a valid credit card number.",function(b,e){var d=$(e.id.substr(0,e.id.indexOf("_cc_number"))+"_cc_type");if(d&&typeof Validation.creditCartTypes.get(d.value)!="undefined"&&Validation.creditCartTypes.get(d.value)[2]==false){if(!Validation.get("IsEmpty").test(b)&&Validation.get("validate-digits").test(b)){return true}else{return false}}return validateCreditCard(b)}],["validate-cc-type","Credit card number does not match credit card type.",function(d,g){g.value=removeDelimiters(g.value);d=removeDelimiters(d);var f=$(g.id.substr(0,g.id.indexOf("_cc_number"))+"_cc_type");if(!f){return true}var e=f.value;if(typeof Validation.creditCartTypes.get(e)=="undefined"){return false}if(Validation.creditCartTypes.get(e)[0]==false){return true}var b="";Validation.creditCartTypes.each(function(h){if(h.value[0]&&d.match(h.value[0])){b=h.key;throw $break}});if(b!=e){return false}if(f.hasClassName("validation-failed")&&Validation.isOnChange){Validation.validate(f)}return true}],["validate-cc-type-select","Card type does not match credit card number.",function(d,e){var b=$(e.id.substr(0,e.id.indexOf("_cc_type"))+"_cc_number");if(Validation.isOnChange&&Validation.get("IsEmpty").test(b.value)){return true}if(Validation.get("validate-cc-type").test(b.value,b)){Validation.validate(b)}return Validation.get("validate-cc-type").test(b.value,b)}],["validate-cc-exp","Incorrect credit card expiration date.",function(b,l){var h=b;var g=$(l.id.substr(0,l.id.indexOf("_expiration"))+"_expiration_yr").value;var f=new Date();var e=f.getMonth()+1;var d=f.getFullYear();if(h<e&&g==d){return false}return true}],["validate-cc-cvn","Please enter a valid credit card verification number.",function(b,g){var f=$(g.id.substr(0,g.id.indexOf("_cc_cid"))+"_cc_type");if(!f){return true}var d=f.value;if(typeof Validation.creditCartTypes.get(d)=="undefined"){return false}var e=Validation.creditCartTypes.get(d)[1];if(b.match(e)){return true}return false}],["validate-ajax","",function(b,d){return true}],["validate-data","Please use only letters (a-z or A-Z), numbers (0-9) or underscore (_) in this field, and the first character should be a letter.",function(b){if(b!=""&&b){return/^[A-Za-z]+[A-Za-z0-9_]+$/.test(b)}return true}],["validate-css-length","Please input a valid CSS-length (Ex: 100px, 77pt, 20em, .5ex or 50%).",function(b){if(b!=""&&b){return/^[0-9\.]+(px|pt|em|ex|%)?$/.test(b)&&(!(/\..*\./.test(b)))&&!(/\.$/.test(b))}return true}],["validate-length","Text length does not meet the specified text range.",function(d,g){var e=new RegExp(/^maximum-length-[0-9]+$/);var f=new RegExp(/^minimum-length-[0-9]+$/);var b=true;$w(g.className).each(function(l,h){if(l.match(e)&&b){var n=l.split("-")[2];b=(d.length<=n)}if(l.match(f)&&b&&!Validation.get("IsEmpty").test(d)){var n=l.split("-")[2];b=(d.length>=n)}});return b}],["validate-percents","Please enter a number lower than 100.",{max:100}],["required-file","Please select a file.",function(d,e){var b=!Validation.get("IsEmpty").test(d);if(b===false){ovId=e.id+"_value";if($(ovId)){b=!Validation.get("IsEmpty").test($(ovId).value)}}return b}],["validate-cc-ukss","Please enter issue number or start date for switch/solo card type.",function(o,g){var b;if(g.id.match(/(.)+_cc_issue$/)){b=g.id.indexOf("_cc_issue")}else{if(g.id.match(/(.)+_start_month$/)){b=g.id.indexOf("_start_month")}else{b=g.id.indexOf("_start_year")}}var f=g.id.substr(0,b);var d=$(f+"_cc_type");if(!d){return true}var n=d.value;if(["SS","SM","SO"].indexOf(n)==-1){return true}$(f+"_cc_issue").advaiceContainer=$(f+"_start_month").advaiceContainer=$(f+"_start_year").advaiceContainer=$(f+"_cc_type_ss_div").down(".adv-container");var h=$(f+"_cc_issue").value;var l=$(f+"_start_month").value;var p=$(f+"_start_year").value;var e=(l&&p)?true:false;if(!e&&!h){return false}return true}]]);function removeDelimiters(b){b=b.replace(/\s/g,"");b=b.replace(/\-/g,"");return b}function parseNumber(b){if(typeof b!="string"){return parseFloat(b)}var e=b.indexOf(".");var d=b.indexOf(",");if(e!=-1&&d!=-1){if(d>e){b=b.replace(".","").replace(",",".")}else{b=b.replace(",","")}}else{if(d!=-1){b=b.replace(",",".")}}return parseFloat(b)}Validation.creditCartTypes=$H({SO:[new RegExp("^(6334[5-9]([0-9]{11}|[0-9]{13,14}))|(6767([0-9]{12}|[0-9]{14,15}))$"),new RegExp("^([0-9]{3}|[0-9]{4})?$"),true],SM:[new RegExp("(^(5[0678])[0-9]{11,18}$)|(^(6[^05])[0-9]{11,18}$)|(^(601)[^1][0-9]{9,16}$)|(^(6011)[0-9]{9,11}$)|(^(6011)[0-9]{13,16}$)|(^(65)[0-9]{11,13}$)|(^(65)[0-9]{15,18}$)|(^(49030)[2-9]([0-9]{10}$|[0-9]{12,13}$))|(^(49033)[5-9]([0-9]{10}$|[0-9]{12,13}$))|(^(49110)[1-2]([0-9]{10}$|[0-9]{12,13}$))|(^(49117)[4-9]([0-9]{10}$|[0-9]{12,13}$))|(^(49118)[0-2]([0-9]{10}$|[0-9]{12,13}$))|(^(4936)([0-9]{12}$|[0-9]{14,15}$))"),new RegExp("^([0-9]{3}|[0-9]{4})?$"),true],VI:[new RegExp("^4[0-9]{12}([0-9]{3})?$"),new RegExp("^[0-9]{3}$"),true],MC:[new RegExp("^5[1-5][0-9]{14}$"),new RegExp("^[0-9]{3}$"),true],AE:[new RegExp("^3[47][0-9]{13}$"),new RegExp("^[0-9]{4}$"),true],DI:[new RegExp("^6(011|4[4-9][0-9]|5[0-9]{2})[0-9]{12}$"),new RegExp("^[0-9]{3}$"),true],JCB:[new RegExp("^(3[0-9]{15}|(2131|1800)[0-9]{11})$"),new RegExp("^[0-9]{3,4}$"),true],OT:[false,new RegExp("^([0-9]{3}|[0-9]{4})?$"),false]});function popWin(d,e,b){var e=window.open(d,e,b);e.focus()}function setLocation(b){window.location.href=b}function setPLocation(d,b){if(b){window.opener.focus()}window.opener.location.href=d}function setLanguageCode(e,f){var b=window.location.href;var h="",g;if(g=b.match(/\#(.*)$/)){b=b.replace(/\#(.*)$/,"");h=g[0]}if(b.match(/[?]/)){var d=/([?&]store=)[a-z0-9_]*/;if(b.match(d)){b=b.replace(d,"$1"+e)}else{b+="&store="+e}var d=/([?&]from_store=)[a-z0-9_]*/;if(b.match(d)){b=b.replace(d,"")}}else{b+="?store="+e}if(typeof f!="undefined"){b+="&from_store="+f}b+=h;setLocation(b)}function decorateGeneric(h,e){var l=["odd","even","first","last"];var d={};var g=h.length;if(g){if(typeof e=="undefined"){e=l}if(!e.length){return}for(var b in l){d[l[b]]=false}for(var b in e){d[e[b]]=true}if(d.first){Element.addClassName(h[0],"first")}if(d.last){Element.addClassName(h[g-1],"last")}for(var f=0;f<g;f++){if((f+1)%2==0){if(d.even){Element.addClassName(h[f],"even")}}else{if(d.odd){Element.addClassName(h[f],"odd")}}}}}function decorateTable(h,e){var h=$(h);if(h){var b={tbody:false,"tbody tr":["odd","even","first","last"],"thead tr":["first","last"],"tfoot tr":["first","last"],"tr td":["last"]};if(typeof e!="undefined"){for(var d in e){b[d]=e[d]}}if(b.tbody){decorateGeneric(h.select("tbody"),b.tbody)}if(b["tbody tr"]){decorateGeneric(h.select("tbody tr"),b["tbody tr"])}if(b["thead tr"]){decorateGeneric(h.select("thead tr"),b["thead tr"])}if(b["tfoot tr"]){decorateGeneric(h.select("tfoot tr"),b["tfoot tr"])}if(b["tr td"]){var g=h.select("tr");if(g.length){for(var f=0;f<g.length;f++){decorateGeneric(g[f].getElementsByTagName("TD"),b["tr td"])}}}}}function decorateList(e,d){if($(e)){if(typeof d=="undefined"){var b=$(e).select("li")}else{var b=$(e).childElements()}decorateGeneric(b,["odd","even","last"])}}function decorateDataList(b){b=$(b);if(b){decorateGeneric(b.select("dt"),["odd","even","last"]);decorateGeneric(b.select("dd"),["odd","even","last"])}}function parseSidUrl(f,e){var d=f.indexOf("/?SID=");var b="";e=e!=undefined?e:"";if(d>-1){b="?"+f.substring(d+2);f=f.substring(0,d+1)}return f+e+b}function formatCurrency(n,q,g){var l=isNaN(q.precision=Math.abs(q.precision))?2:q.precision;var v=isNaN(q.requiredPrecision=Math.abs(q.requiredPrecision))?2:q.requiredPrecision;l=v;var t=isNaN(q.integerRequired=Math.abs(q.integerRequired))?1:q.integerRequired;var p=q.decimalSymbol==undefined?",":q.decimalSymbol;var e=q.groupSymbol==undefined?".":q.groupSymbol;var d=q.groupLength==undefined?3:q.groupLength;var u="";if(g==undefined||g==true){u=n<0?"-":g?"+":""}else{if(g==false){u=""}}var h=parseInt(n=Math.abs(+n||0).toFixed(l))+"";var f=h.length<t?t-h.length:0;while(f){h="0"+h;f--}j=(j=h.length)>d?j%d:0;re=new RegExp("(\\d{"+d+"})(?=\\d)","g");var b=(j?h.substr(0,j)+e:"")+h.substr(j).replace(re,"$1"+e)+(l?p+Math.abs(n-h).toFixed(l).replace(/-/,0).slice(2):"");var o="";if(q.pattern.indexOf("{sign}")==-1){o=u+q.pattern}else{o=q.pattern.replace("{sign}",u)}return o.replace("%s",b).replace(/^\s\s*/,"").replace(/\s\s*$/,"")}function expandDetails(d,b){if(Element.hasClassName(d,"show-details")){$$(b).each(function(e){e.hide()});Element.removeClassName(d,"show-details")}else{$$(b).each(function(e){e.show()});Element.addClassName(d,"show-details")}}var isIE=navigator.appVersion.match(/MSIE/)=="MSIE";if(!window.Varien){var Varien=new Object()}Varien.showLoading=function(){var b=$("loading-process");b&&b.show()};Varien.hideLoading=function(){var b=$("loading-process");b&&b.hide()};Varien.GlobalHandlers={onCreate:function(){Varien.showLoading()},onComplete:function(){if(Ajax.activeRequestCount==0){Varien.hideLoading()}}};Ajax.Responders.register(Varien.GlobalHandlers);Varien.searchForm=Class.create();Varien.searchForm.prototype={initialize:function(d,e,b){this.form=$(d);this.field=$(e);this.emptyText=b;Event.observe(this.form,"submit",this.submit.bind(this));Event.observe(this.field,"focus",this.focus.bind(this));Event.observe(this.field,"blur",this.blur.bind(this));this.blur()},submit:function(b){if(this.field.value==this.emptyText||this.field.value==""){Event.stop(b);return false}return true},focus:function(b){if(this.field.value==this.emptyText){this.field.value=""}},blur:function(b){if(this.field.value==""){this.field.value=this.emptyText}}};Varien.DateElement=Class.create();Varien.DateElement.prototype={initialize:function(b,d,f,e){if(b=="id"){this.day=$(d+"day");this.month=$(d+"month");this.year=$(d+"year");this.full=$(d+"full");this.advice=$(d+"date-advice")}else{if(b=="container"){this.day=d.day;this.month=d.month;this.year=d.year;this.full=d.full;this.advice=d.advice}else{return}}this.required=f;this.format=e;this.day.addClassName("validate-custom");this.day.validate=this.validate.bind(this);this.month.addClassName("validate-custom");this.month.validate=this.validate.bind(this);this.year.addClassName("validate-custom");this.year.validate=this.validate.bind(this);this.setDateRange(false,false);this.year.setAttribute("autocomplete","off");this.advice.hide()},validate:function(){var l=false,o=parseInt(this.day.value,10)||0,f=parseInt(this.month.value,10)||0,h=parseInt(this.year.value,10)||0;if(this.day.value.strip().empty()&&this.month.value.strip().empty()&&this.year.value.strip().empty()){if(this.required){l="Please enter a date."}else{this.full.value=""}}else{if(!o||!f||!h){l="Please enter a valid full date."}else{var d=new Date,n=0,e=null;d.setYear(h);d.setMonth(f-1);d.setDate(32);n=32-d.getDate();if(!n||n>31){n=31}if(o<1||o>n){e="day";l="Please enter a valid day (1-%1)."}else{if(f<1||f>12){e="month";l="Please enter a valid month (1-12)."}else{if(o%10==o){this.day.value="0"+o}if(f%10==f){this.month.value="0"+f}this.full.value=this.format.replace(/%[mb]/i,this.month.value).replace(/%[de]/i,this.day.value).replace(/%y/i,this.year.value);var b=this.month.value+"/"+this.day.value+"/"+this.year.value;var g=new Date(b);if(isNaN(g)){l="Please enter a valid date."}else{this.setFullDate(g)}}}var p=false;if(!l&&!this.validateData()){e=this.validateDataErrorType;p=this.validateDataErrorText;l=p}}}if(l!==false){if(jQuery.mage.__){l=jQuery.mage.__(l)}if(!p){this.advice.innerHTML=l.replace("%1",n)}else{this.advice.innerHTML=this.errorTextModifier(l)}this.advice.show();return false}this.day.removeClassName("validation-failed");this.month.removeClassName("validation-failed");this.year.removeClassName("validation-failed");this.advice.hide();return true},validateData:function(){var d=this.fullDate.getFullYear();var b=new Date;this.curyear=b.getFullYear();return d>=1900&&d<=this.curyear},validateDataErrorType:"year",validateDataErrorText:"Please enter a valid year (1900-%1).",errorTextModifier:function(b){return b.replace("%1",this.curyear)},setDateRange:function(b,d){this.minDate=b;this.maxDate=d},setFullDate:function(b){this.fullDate=b}};Varien.DOB=Class.create();Varien.DOB.prototype={initialize:function(b,g,f){var e=$$(b)[0];var d={};d.day=Element.select(e,".dob-day input")[0];d.month=Element.select(e,".dob-month input")[0];d.year=Element.select(e,".dob-year input")[0];d.full=Element.select(e,".dob-full input")[0];d.advice=Element.select(e,".validation-advice")[0];new Varien.DateElement("container",d,g,f)}};Varien.dateRangeDate=Class.create();Varien.dateRangeDate.prototype=Object.extend(new Varien.DateElement(),{validateData:function(){var b=true;if(this.minDate||this.maxValue){if(this.minDate){this.minDate=new Date(this.minDate);this.minDate.setHours(0);if(isNaN(this.minDate)){this.minDate=new Date("1/1/1900")}b=b&&this.fullDate>=this.minDate}if(this.maxDate){this.maxDate=new Date(this.maxDate);this.minDate.setHours(0);if(isNaN(this.maxDate)){this.maxDate=new Date()}b=b&&this.fullDate<=this.maxDate}if(this.maxDate&&this.minDate){this.validateDataErrorText="Please enter a valid date between %s and %s"}else{if(this.maxDate){this.validateDataErrorText="Please enter a valid date less than or equal to %s"}else{if(this.minDate){this.validateDataErrorText="Please enter a valid date equal to or greater than %s"}else{this.validateDataErrorText=""}}}}return b},validateDataErrorText:"Date should be between %s and %s",errorTextModifier:function(b){if(this.minDate){b=b.sub("%s",this.dateFormat(this.minDate))}if(this.maxDate){b=b.sub("%s",this.dateFormat(this.maxDate))}return b},dateFormat:function(b){return b.getMonth()+1+"/"+b.getDate()+"/"+b.getFullYear()}});Varien.FileElement=Class.create();Varien.FileElement.prototype={initialize:function(b){this.fileElement=$(b);this.hiddenElement=$(b+"_value");this.fileElement.observe("change",this.selectFile.bind(this))},selectFile:function(b){this.hiddenElement.value=this.fileElement.getValue()}};Validation.addAllThese([["validate-custom"," ",function(b,d){return d.validate()}]]);Element.addMethods({getInnerText:function(b){b=$(b);if(b.innerText&&!Prototype.Browser.Opera){return b.innerText}return b.innerHTML.stripScripts().unescapeHTML().replace(/[\n\r\s]+/g," ").strip()}});function fireEvent(d,e){if(document.createEvent){var b=document.createEvent("HTMLEvents");b.initEvent(e,true,true);return d.dispatchEvent(b)}var b=document.createEventObject();return d.fireEvent("on"+e,b)}function modulo(b,f){var e=f/10000;var d=b%f;if(Math.abs(d-f)<e||Math.abs(d)<e){d=0}return d}if(typeof Range!="undefined"&&!Range.prototype.createContextualFragment){Range.prototype.createContextualFragment=function(b){var e=document.createDocumentFragment(),d=document.createElement("div");e.appendChild(d);d.outerHTML=b;return e}}var byteConvert=function(b){if(isNaN(b)){return""}var d=["bytes","KB","MB","GB","TB","PB","EB","ZB","YB"];var f=Math.floor(Math.log(b)/Math.log(2));if(f<1){f=0}var e=Math.floor(f/10);b/=Math.pow(2,10*e);if(b.toString().length>b.toFixed(2).toString().length){b=b.toFixed(2)}return b+" "+d[e]};var SessionError=Class.create();SessionError.prototype={initialize:function(b){this.errorText=b},toString:function(){return"Session Error:"+this.errorText}};Ajax.Request.addMethods({initialize:function($super,d,b){$super(b);this.transport=Ajax.getTransport();if(!d.match(new RegExp("[?&]isAjax=true",""))){d=d.match(new RegExp("\\?","g"))?d+"&isAjax=true":d+"?isAjax=true"}if(Object.isString(this.options.parameters)&&this.options.parameters.indexOf("form_key=")==-1){this.options.parameters+="&"+Object.toQueryString({form_key:FORM_KEY})}else{if(!this.options.parameters){this.options.parameters={form_key:FORM_KEY}}if(!this.options.parameters.form_key){this.options.parameters.form_key=FORM_KEY}}this.request(d)},respondToReadyState:function(b){var g=Ajax.Request.Events[b],d=new Ajax.Response(this);if(g=="Complete"){try{this._complete=true;if(d.responseText.isJSON()){var f=d.responseText.evalJSON();if(f.ajaxExpired&&f.ajaxRedirect){window.location.replace(f.ajaxRedirect);throw new SessionError("session expired")}}(this.options["on"+d.status]||this.options["on"+(this.success()?"Success":"Failure")]||Prototype.emptyFunction)(d,d.headerJSON)}catch(h){this.dispatchException(h);if(h instanceof SessionError){return}}var l=d.getHeader("Content-type");if(this.options.evalJS=="force"||this.options.evalJS&&this.isSameOrigin()&&l&&l.match(/^\s*(text|application)\/(x-)?(java|ecma)script(;.*)?\s*$/i)){this.evalResponse()}}try{(this.options["on"+g]||Prototype.emptyFunction)(d,d.headerJSON);Ajax.Responders.dispatch("on"+g,this,d,d.headerJSON)}catch(h){this.dispatchException(h)}if(g=="Complete"){this.transport.onreadystatechange=Prototype.emptyFunction}}});Ajax.Updater.respondToReadyState=Ajax.Request.respondToReadyState;var varienLoader=new Class.create();varienLoader.prototype={initialize:function(b){this.callback=false;this.cache=$H();this.caching=b||false;this.url=false},getCache:function(b){if(this.cache.get(b)){return this.cache.get(b)}return false},load:function(b,d,f){this.url=b;this.callback=f;if(this.caching){var e=this.getCache(b);if(e){this.processResult(e);return}}if(typeof d.updaterId!="undefined"){new varienUpdater(d.updaterId,b,{evalScripts:true,onComplete:this.processResult.bind(this),onFailure:this._processFailure.bind(this)})}else{new Ajax.Request(b,{method:"post",parameters:d||{},onComplete:this.processResult.bind(this),onFailure:this._processFailure.bind(this)})}},_processFailure:function(b){location.href=BASE_URL},processResult:function(b){if(this.caching){this.cache.set(this.url,b)}if(this.callback){this.callback(b.responseText)}}};if(!window.varienLoaderHandler){var varienLoaderHandler=new Object()}varienLoaderHandler.handler={onCreate:function(b){if(b.options.loaderArea===false){return}jQuery("body").trigger("processStart")},onException:function(b){jQuery("body").trigger("processStop")},onComplete:function(b){jQuery("body").trigger("processStop")}};function setLoaderPosition(){var e=$("loading_mask_loader");if(e&&Prototype.Browser.IE){var d=e.getDimensions();var f=document.viewport.getDimensions();var b=document.viewport.getScrollOffsets();e.style.left=Math.floor(f.width/2+b.left-d.width/2)+"px";e.style.top=Math.floor(f.height/2+b.top-d.height/2)+"px";e.style.position="absolute"}}function toggleSelectsUnderBlock(f,b){if(Prototype.Browser.IE){var e=document.getElementsByTagName("select");for(var d=0;d<e.length;d++){if(b){if(e[d].needShowOnSuccess){e[d].needShowOnSuccess=false;e[d].style.visibility=""}}else{if(Element.visible(e[d])){e[d].style.visibility="hidden";e[d].needShowOnSuccess=true}}}}}Ajax.Responders.register(varienLoaderHandler.handler);var varienUpdater=Class.create(Ajax.Updater,{updateContent:function($super,b){if(b.isJSON()){var d=b.evalJSON();if(d.ajaxExpired&&d.ajaxRedirect){window.location.replace(d.ajaxRedirect)}}else{$super(b)}}});function setLocation(b){window.location.href=b}function setElementDisable(d,b){if($(d)){$(d).disabled=b}}function toggleParentVis(b){b=$(b).parentNode;if(b.style.display=="none"){b.style.display=""}else{b.style.display="none"}}function toggleFieldsetVis(d){id=d;d=$(d);if(d.style.display=="none"){d.style.display=""}else{d.style.display="none"}d=d.parentNode.childElements();for(var b=0;b<d.length;b++){if(d[b].id!=undefined&&d[b].id==id&&d[b-1].classNames()=="entry-edit-head"){if(d[b-1].style.display=="none"){d[b-1].style.display=""}else{d[b-1].style.display="none"}}}}function toggleVis(b){b=$(b);if(b.style.display=="none"){b.style.display=""}else{b.style.display="none"}}function imagePreview(b){if($(b)){var d=window.open("","preview","width=400,height=400,resizable=1,scrollbars=1");d.document.open();d.document.write('<body style="padding:0;margin:0"><img src="'+$(b).src+'" id="image_preview"/></body>');d.document.close();Event.observe(d,"load",function(){var e=d.document.getElementById("image_preview");d.resizeTo(e.width+40,e.height+80)})}}function checkByProductPriceType(b){if(b.id=="price_type"){this.productPriceType=b.value;return false}if(b.id=="price"&&this.productPriceType==0){return false}return true}function toggleSeveralValueElements(f,e,b,d){if(e&&f){if(Object.prototype.toString.call(e)!="[object Array]"){e=[e]}e.each(function(g){toggleValueElements(f,g,b,d)})}}function toggleValueElements(l,d,f,h){if(d&&l){var n=[l];if(typeof f!="undefined"){if(Object.prototype.toString.call(f)!="[object Array]"){f=[f]}for(var g=0;g<f.length;g++){n.push(f[g])}}var e=Element.select(d,["select","input","textarea","button","img"]).filter(function(o){return o.readAttribute("type")!="hidden"});var b=h!=undefined?h:l.checked;e.each(function(p){if(checkByProductPriceType(p)){var o=n.length;while(o--&&p!=n[o]){}if(o!=-1){return}p.disabled=b;if(b){p.addClassName("disabled")}else{p.removeClassName("disabled")}if(p.nodeName.toLowerCase()=="img"){b?p.hide():p.show()}}})}}function submitAndReloadArea(e,d){if($(e)){var b=$(e).select("input","select","textarea");var f=Form.serializeElements(b,true);d+=d.match(new RegExp("\\?"))?"&isAjax=true":"?isAjax=true";new Ajax.Request(d,{parameters:$H(f),loaderArea:e,onSuccess:function(l){try{if(l.responseText.isJSON()){var g=l.responseText.evalJSON();if(g.error){alert(g.message)}if(g.ajaxExpired&&g.ajaxRedirect){setLocation(g.ajaxRedirect)}}else{$(e).update(l.responseText)}}catch(h){$(e).update(l.responseText)}}})}}function syncOnchangeValue(d,e){var b={baseElem:d,distElem:e};Event.observe(d,"change",function(){if($(this.baseElem)&&$(this.distElem)){$(this.distElem).value=$(this.baseElem).value}}.bind(b))}function updateElementAtCursor(e,f,g){if(g==undefined){g=window.self}if(document.selection){e.focus();sel=g.document.selection.createRange();sel.text=f}else{if(e.selectionStart||e.selectionStart=="0"){var d=e.selectionStart;var b=e.selectionEnd;e.value=e.value.substring(0,d)+f+e.value.substring(b,e.value.length)}else{e.value+=f}}}function firebugEnabled(){if(window.console&&window.console.firebug){return true}return false}function disableElement(b){b.disabled=true;b.addClassName("disabled")}function enableElement(b){b.disabled=false;b.removeClassName("disabled")}function disableElements(b){$$("."+b).each(disableElement)}function enableElements(b){$$("."+b).each(enableElement)}var Cookie={all:function(){var d=document.cookie.split(";");var b={};d.each(function(f,e){var g=f.strip().split("=");b[unescape(g[0])]=unescape(g[1])});return b},read:function(d){var b=this.all();if(b[d]){return b[d]}return null},write:function(h,f,g){var b="";if(g){var e=new Date();e.setTime(e.getTime()+g*1000);b="; expires="+e.toUTCString()}var d="/"+BASE_URL.split("/").slice(3).join("/");document.cookie=escape(h)+"="+escape(f)+b+"; path="+d},clear:function(b){this.write(b,"",-1)}};var Fieldset={cookiePrefix:"fh-",applyCollapse:function(b){if($(b+"-state")){collapsed=$(b+"-state").value==1?0:1}else{collapsed=$(b+"-head").collapsed}if(collapsed==1||collapsed===undefined){$(b+"-head").removeClassName("open");if($(b+"-head").up(".section-config")){$(b+"-head").up(".section-config").removeClassName("active")}$(b).hide()}else{$(b+"-head").addClassName("open");if($(b+"-head").up(".section-config")){$(b+"-head").up(".section-config").addClassName("active")}$(b).show()}},toggleCollapse:function(b,d){if($(b+"-state")){collapsed=$(b+"-state").value==1?0:1}else{collapsed=$(b+"-head").collapsed}if(collapsed==1||collapsed===undefined){if($(b+"-state")){$(b+"-state").value=1}$(b+"-head").collapsed=0}else{if($(b+"-state")){$(b+"-state").value=0}$(b+"-head").collapsed=1}this.applyCollapse(b);if(typeof d!="undefined"){this.saveState(d,{container:b,value:$(b+"-state").value})}},addToPrefix:function(b){this.cookiePrefix+=b+"-"},saveState:function(b,d){new Ajax.Request(b,{method:"get",parameters:Object.toQueryString(d),loaderArea:false})}};var Base64={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(e){var b="";var p,n,h,o,l,g,f;var d=0;e=Base64._utf8_encode(e);if(typeof window.btoa==="function"){return window.btoa(e)}while(d<e.length){p=e.charCodeAt(d++);n=e.charCodeAt(d++);h=e.charCodeAt(d++);o=p>>2;l=(p&3)<<4|n>>4;g=(n&15)<<2|h>>6;f=h&63;if(isNaN(n)){g=f=64}else{if(isNaN(h)){f=64}}b=b+this._keyStr.charAt(o)+this._keyStr.charAt(l)+this._keyStr.charAt(g)+this._keyStr.charAt(f)}return b},decode:function(e){var b="";var p,n,h;var o,l,g,f;var d=0;if(typeof window.atob==="function"){return Base64._utf8_decode(window.atob(e))}e=e.replace(/[^A-Za-z0-9\+\/\=]/g,"");while(d<e.length){o=this._keyStr.indexOf(e.charAt(d++));l=this._keyStr.indexOf(e.charAt(d++));g=this._keyStr.indexOf(e.charAt(d++));f=this._keyStr.indexOf(e.charAt(d++));p=o<<2|l>>4;n=(l&15)<<4|g>>2;h=(g&3)<<6|f;b+=String.fromCharCode(p);if(g!=64){b+=String.fromCharCode(n)}if(f!=64){b+=String.fromCharCode(h)}}return Base64._utf8_decode(b)},mageEncode:function(b){return this.encode(b).replace(/\+/g,"-").replace(/\//g,"_").replace(/=/g,",")},mageDecode:function(b){b=b.replace(/\-/g,"+").replace(/_/g,"/").replace(/,/g,"=");return this.decode(b)},idEncode:function(b){return this.encode(b).replace(/\+/g,":").replace(/\//g,"_").replace(/=/g,"-")},idDecode:function(b){b=b.replace(/\-/g,"=").replace(/_/g,"/").replace(/\:/g,"+");return this.decode(b)},_utf8_encode:function(d){d=d.replace(/\r\n/g,"\n");var b="";for(var f=0;f<d.length;f++){var e=d.charCodeAt(f);if(e<128){b+=String.fromCharCode(e)}else{if(e>127&&e<2048){b+=String.fromCharCode(e>>6|192);b+=String.fromCharCode(e&63|128)}else{b+=String.fromCharCode(e>>12|224);b+=String.fromCharCode(e>>6&63|128);b+=String.fromCharCode(e&63|128)}}}return b},_utf8_decode:function(b){var d="";var e=0;var f=c1=c2=0;while(e<b.length){f=b.charCodeAt(e);if(f<128){d+=String.fromCharCode(f);e++}else{if(f>191&&f<224){c2=b.charCodeAt(e+1);d+=String.fromCharCode((f&31)<<6|c2&63);e+=2}else{c2=b.charCodeAt(e+1);c3=b.charCodeAt(e+2);d+=String.fromCharCode((f&15)<<12|(c2&63)<<6|c3&63);e+=3}}}return d}};function sortNumeric(d,b){return d-b}(function(){var globals=["Prototype","Abstract","Try","Class","PeriodicalExecuter","Template","$break","Enumerable","$A","$w","$H","Hash","$R","ObjectRange","Ajax","$","Form","Field","$F","Toggle","Insertion","$continue","Position","Windows","Dialog","array","WindowUtilities","Builder","Effect","validateCreditCard","Validator","Validation","removeDelimiters","parseNumber","popWin","setLocation","setPLocation","setLanguageCode","decorateGeneric","decorateTable","decorateList","decorateDataList","parseSidUrl","formatCurrency","expandDetails","isIE","Varien","fireEvent","modulo","byteConvert","SessionError","varienLoader","varienLoaderHandler","setLoaderPosition","toggleSelectsUnderBlock","varienUpdater","setElementDisable","toggleParentVis","toggleFieldsetVis","toggleVis","imagePreview","checkByProductPriceType","toggleSeveralValueElements","toggleValueElements","submitAndReloadArea","syncOnchangeValue","updateElementAtCursor","firebugEnabled","disableElement","enableElement","disableElements","enableElements","Cookie","Fieldset","Base64","sortNumeric","Element","$$","Sizzle","Selector","Window"];globals.forEach(function(prop){window[prop]=eval(prop)})})();
\ No newline at end of file
diff --git a/lib/web/mage/adminhtml/tools.js b/lib/web/mage/adminhtml/tools.js
index f23a0193cb6..ed4bab7102a 100644
--- a/lib/web/mage/adminhtml/tools.js
+++ b/lib/web/mage/adminhtml/tools.js
@@ -89,12 +89,6 @@ function checkByProductPriceType(elem) {
 
 }
 
-Event.observe(window, 'load', function () {
-    if ($('price_default') && $('price_default').checked) {
-        $('price').disabled = 'disabled';
-    }
-});
-
 function toggleSeveralValueElements(checkbox, containers, excludedElements, checked) {
     'use strict';
 
diff --git a/lib/web/mage/popup-window.js b/lib/web/mage/popup-window.js
index de150b1b9b0..37c3b27a451 100644
--- a/lib/web/mage/popup-window.js
+++ b/lib/web/mage/popup-window.js
@@ -57,14 +57,8 @@ define([
             settings.windowURL = settings.windowURL || element.attr('href');
 
             if (settings.centerBrowser) {
-                if ($.browser.msie) { // Hacked together for IE browsers
-                    centeredY = window.screenTop - 120 +
-                        (((document.documentElement.clientHeight + 120) / 2 - settings.height / 2));
-                    centeredX = window.screenLeft + (((document.body.offsetWidth + 20) / 2 - settings.width / 2));
-                } else {
-                    centeredY = window.screenY + ((window.outerHeight / 2 - settings.height / 2));
-                    centeredX = window.screenX + ((window.outerWidth / 2 - settings.width / 2));
-                }
+                centeredY = window.screenY + ((window.outerHeight / 2 - settings.height / 2));
+                centeredX = window.screenX + ((window.outerWidth / 2 - settings.width / 2));
                 windowFeatures += ',left=' + centeredX + ',top=' + centeredY;
             } else if (settings.centerScreen) {
                 centeredY = (screen.height - settings.height) / 2;
diff --git a/lib/web/varien/form.js b/lib/web/varien/form.js
deleted file mode 100644
index 02e5e82ecfe..00000000000
--- a/lib/web/varien/form.js
+++ /dev/null
@@ -1,410 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/**
- * @deprecated since version 2.2.0
- */
-VarienForm = Class.create();
-VarienForm.prototype = {
-    initialize: function (formId, firstFieldFocus) {
-        this.form       = $(formId);
-
-        if (!this.form) {
-            return;
-        }
-        this.cache      = $A();
-        this.currLoader = false;
-        this.currDataIndex = false;
-        this.validator  = new Validation(this.form);
-        this.elementFocus   = this.elementOnFocus.bindAsEventListener(this);
-        this.elementBlur    = this.elementOnBlur.bindAsEventListener(this);
-        this.childLoader    = this.onChangeChildLoad.bindAsEventListener(this);
-        this.highlightClass = 'highlight';
-        this.extraChildParams = '';
-        this.firstFieldFocus = firstFieldFocus || false;
-        this.bindElements();
-
-        if (this.firstFieldFocus) {
-            try {
-                Form.Element.focus(Form.findFirstElement(this.form));
-            }
-            catch (e) {}
-        }
-    },
-
-    submit: function (url) {
-        if (this.validator && this.validator.validate()) {
-            this.form.submit();
-        }
-
-        return false;
-    },
-
-    bindElements: function () {
-        var elements = Form.getElements(this.form);
-
-        for (var row in elements) {
-            if (elements[row].id) {
-                Event.observe(elements[row], 'focus', this.elementFocus);
-                Event.observe(elements[row], 'blur', this.elementBlur);
-            }
-        }
-    },
-
-    elementOnFocus: function (event) {
-        var element = Event.findElement(event, 'fieldset');
-
-        if (element) {
-            Element.addClassName(element, this.highlightClass);
-        }
-    },
-
-    elementOnBlur: function (event) {
-        var element = Event.findElement(event, 'fieldset');
-
-        if (element) {
-            Element.removeClassName(element, this.highlightClass);
-        }
-    },
-
-    setElementsRelation: function (parent, child, dataUrl, first) {
-        if (parent = $(parent)) {
-            // TODO: array of relation and caching
-            if (!this.cache[parent.id]) {
-                this.cache[parent.id] = $A();
-                this.cache[parent.id]['child']     = child;
-                this.cache[parent.id]['dataUrl']   = dataUrl;
-                this.cache[parent.id]['data']      = $A();
-                this.cache[parent.id]['first']      = first || false;
-            }
-            Event.observe(parent, 'change', this.childLoader);
-        }
-    },
-
-    onChangeChildLoad: function (event) {
-        element = Event.element(event);
-        this.elementChildLoad(element);
-    },
-
-    elementChildLoad: function (element, callback) {
-        this.callback = callback || false;
-
-        if (element.value) {
-            this.currLoader = element.id;
-            this.currDataIndex = element.value;
-
-            if (this.cache[element.id]['data'][element.value]) {
-                this.setDataToChild(this.cache[element.id]['data'][element.value]);
-            } else {
-                new Ajax.Request(this.cache[this.currLoader]['dataUrl'],{
-                        method: 'post',
-                        parameters: {
-                            'parent': element.value
-                        },
-                        onComplete: this.reloadChildren.bind(this)
-                    });
-            }
-        }
-    },
-
-    reloadChildren: function (transport) {
-        var data = eval('(' + transport.responseText + ')');
-
-        this.cache[this.currLoader]['data'][this.currDataIndex] = data;
-        this.setDataToChild(data);
-    },
-
-    setDataToChild: function (data) {
-        if (data.length) {
-            var child = $(this.cache[this.currLoader]['child']);
-
-            if (child) {
-                var html = '<select name="' + child.name + '" id="' + child.id + '" class="' + child.className + '" title="' + child.title + '" ' + this.extraChildParams + '>';
-
-                if (this.cache[this.currLoader]['first']) {
-                    html += '<option value="">' + this.cache[this.currLoader]['first'] + '</option>';
-                }
-
-                for (var i in data) {
-                    if (data[i].value) {
-                        html += '<option value="' + data[i].value + '"';
-
-                        if (child.value && (child.value == data[i].value || child.value == data[i].label)) {
-                            html += ' selected';
-                        }
-                        html += '>' + data[i].label + '</option>';
-                    }
-                }
-                html += '</select>';
-                Element.insert(child, {
-                    before: html
-                });
-                Element.remove(child);
-            }
-        } else {
-            var child = $(this.cache[this.currLoader]['child']);
-
-            if (child) {
-                var html = '<input type="text" name="' + child.name + '" id="' + child.id + '" class="' + child.className + '" title="' + child.title + '" ' + this.extraChildParams + '>';
-
-                Element.insert(child, {
-                    before: html
-                });
-                Element.remove(child);
-            }
-        }
-
-        this.bindElements();
-
-        if (this.callback) {
-            this.callback();
-        }
-    }
-};
-
-RegionUpdater = Class.create();
-RegionUpdater.prototype = {
-    initialize: function (countryEl, regionTextEl, regionSelectEl, regions, disableAction, zipEl) {
-        this.countryEl = $(countryEl);
-        this.regionTextEl = $(regionTextEl);
-        this.regionSelectEl = $(regionSelectEl);
-        this.zipEl = $(zipEl);
-        this.config = regions['config'];
-        delete regions.config;
-        this.regions = regions;
-
-        this.disableAction = typeof disableAction == 'undefined' ? 'hide' : disableAction;
-        this.zipOptions = typeof zipOptions == 'undefined' ? false : zipOptions;
-
-        if (this.regionSelectEl.options.length <= 1) {
-            this.update();
-        }
-
-        Event.observe(this.countryEl, 'change', this.update.bind(this));
-    },
-
-    _checkRegionRequired: function () {
-        var label, wildCard;
-        var elements = [this.regionTextEl, this.regionSelectEl];
-        var that = this;
-
-        if (typeof this.config == 'undefined') {
-            return;
-        }
-        var regionRequired = this.config.regions_required.indexOf(this.countryEl.value) >= 0;
-
-        elements.each(function (currentElement) {
-            Validation.reset(currentElement);
-            label = $$('label[for="' + currentElement.id + '"]')[0];
-
-            if (label) {
-                wildCard = label.down('em') || label.down('span.required');
-
-                if (!that.config.show_all_regions) {
-                    if (regionRequired) {
-                        label.up().show();
-                    } else {
-                        label.up().hide();
-                    }
-                }
-            }
-
-            if (label && wildCard) {
-                if (!regionRequired) {
-                    wildCard.hide();
-
-                    if (label.hasClassName('required')) {
-                        label.removeClassName('required');
-                    }
-                } else if (regionRequired) {
-                    wildCard.show();
-
-                    if (!label.hasClassName('required')) {
-                        label.addClassName('required');
-                    }
-                }
-            }
-
-            if (!regionRequired) {
-                if (currentElement.hasClassName('required-entry')) {
-                    currentElement.removeClassName('required-entry');
-                }
-
-                if ('select' == currentElement.tagName.toLowerCase() &&
-                    currentElement.hasClassName('validate-select')) {
-                    currentElement.removeClassName('validate-select');
-                }
-            } else {
-                if (!currentElement.hasClassName('required-entry')) {
-                    currentElement.addClassName('required-entry');
-                }
-
-                if ('select' == currentElement.tagName.toLowerCase() &&
-                    !currentElement.hasClassName('validate-select')) {
-                    currentElement.addClassName('validate-select');
-                }
-            }
-        });
-    },
-
-    update: function () {
-        if (this.regions[this.countryEl.value]) {
-            var i, option, region, def;
-
-            def = this.regionSelectEl.getAttribute('defaultValue');
-
-            if (this.regionTextEl) {
-                if (!def) {
-                    def = this.regionTextEl.value.toLowerCase();
-                }
-                this.regionTextEl.value = '';
-            }
-
-            this.regionSelectEl.options.length = 1;
-
-            for (regionId in this.regions[this.countryEl.value]) {
-                region = this.regions[this.countryEl.value][regionId];
-
-                option = document.createElement('OPTION');
-                option.value = regionId;
-                option.text = region.name.stripTags();
-                option.title = region.name;
-
-                if (this.regionSelectEl.options.add) {
-                    this.regionSelectEl.options.add(option);
-                } else {
-                    this.regionSelectEl.appendChild(option);
-                }
-
-                if (regionId == def || region.name && region.name.toLowerCase() == def ||
-                    region.name && region.code.toLowerCase() == def
-                ) {
-                    this.regionSelectEl.value = regionId;
-                }
-            }
-
-            if (this.disableAction == 'hide') {
-                if (this.regionTextEl) {
-                    this.regionTextEl.style.display = 'none';
-                }
-
-                this.regionSelectEl.style.display = '';
-            } else if (this.disableAction == 'disable') {
-                if (this.regionTextEl) {
-                    this.regionTextEl.disabled = true;
-                }
-                this.regionSelectEl.disabled = false;
-            }
-            this.setMarkDisplay(this.regionSelectEl, true);
-        } else {
-            this.regionSelectEl.options.length = 1;
-
-            if (this.disableAction == 'hide') {
-                if (this.regionTextEl) {
-                    this.regionTextEl.style.display = '';
-                }
-                this.regionSelectEl.style.display = 'none';
-                Validation.reset(this.regionSelectEl);
-            } else if (this.disableAction == 'disable') {
-                if (this.regionTextEl) {
-                    this.regionTextEl.disabled = false;
-                }
-                this.regionSelectEl.disabled = true;
-            } else if (this.disableAction == 'nullify') {
-                this.regionSelectEl.options.length = 1;
-                this.regionSelectEl.value = '';
-                this.regionSelectEl.selectedIndex = 0;
-                this.lastCountryId = '';
-            }
-            this.setMarkDisplay(this.regionSelectEl, false);
-        }
-
-        this._checkRegionRequired();
-        // Make Zip and its label required/optional
-        var zipUpdater = new ZipUpdater(this.countryEl.value, this.zipEl);
-
-        zipUpdater.update();
-    },
-
-    setMarkDisplay: function (elem, display) {
-        elem = $(elem);
-        var labelElement = elem.up(0).down('label > span.required') ||
-                           elem.up(1).down('label > span.required') ||
-                           elem.up(0).down('label.required > em') ||
-                           elem.up(1).down('label.required > em');
-
-        if (labelElement) {
-            inputElement = labelElement.up().next('input');
-
-            if (display) {
-                labelElement.show();
-
-                if (inputElement) {
-                    inputElement.addClassName('required-entry');
-                }
-            } else {
-                labelElement.hide();
-
-                if (inputElement) {
-                    inputElement.removeClassName('required-entry');
-                }
-            }
-        }
-    }
-};
-
-ZipUpdater = Class.create();
-ZipUpdater.prototype = {
-    initialize: function (country, zipElement) {
-        this.country = country;
-        this.zipElement = $(zipElement);
-    },
-
-    update: function () {
-        // Country ISO 2-letter codes must be pre-defined
-        if (typeof optionalZipCountries == 'undefined') {
-            return false;
-        }
-
-        // Ajax-request and normal content load compatibility
-        if (this.zipElement != undefined) {
-            this._setPostcodeOptional();
-        } else {
-            Event.observe(window, 'load', this._setPostcodeOptional.bind(this));
-        }
-    },
-
-    _setPostcodeOptional: function () {
-        this.zipElement = $(this.zipElement);
-
-        if (this.zipElement == undefined) {
-            return false;
-        }
-
-        // find label
-        var label = $$('label[for="' + this.zipElement.id + '"]')[0];
-
-        if (label != undefined) {
-            var wildCard = label.down('em') || label.down('span.required');
-        }
-
-        // Make Zip and its label required/optional
-        if (optionalZipCountries.indexOf(this.country) != -1) {
-            while (this.zipElement.hasClassName('required-entry')) {
-                this.zipElement.removeClassName('required-entry');
-            }
-
-            if (wildCard != undefined) {
-                wildCard.hide();
-            }
-        } else {
-            this.zipElement.addClassName('required-entry');
-
-            if (wildCard != undefined) {
-                wildCard.show();
-            }
-        }
-    }
-};
diff --git a/setup/pub/magento/setup/main.js b/setup/pub/magento/setup/main.js
index f92011f3952..d9d8b514566 100644
--- a/setup/pub/magento/setup/main.js
+++ b/setup/pub/magento/setup/main.js
@@ -93,10 +93,6 @@ main.controller('navigationController',
             return str.indexOf(suffix, str.length - suffix.length) !== -1;
         };
 
-        $scope.goToStart = function() {
-            $scope.goToAction($state.current.type);
-        };
-
         $scope.goToBackup = function() {
             $state.go('root.create-backup-uninstall');
         };
diff --git a/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php b/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php
index 938a23071fe..00c60a2a8a6 100644
--- a/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/ConfigurableProductsFixture.php
@@ -722,6 +722,8 @@ private function getSearchTerms()
         if ($searchTerms !== null) {
             $searchTerms = array_key_exists(0, $searchTerms['search_term'])
                 ? $searchTerms['search_term'] : [$searchTerms['search_term']];
+        } else {
+            $searchTerms = [];
         }
         return $searchTerms;
     }
@@ -845,10 +847,11 @@ private function getDescriptionClosure(
             $minAmountOfWordsDescription,
             $descriptionPrefix
         ) {
-            $count = $searchTerms === null
+            $countSearchTerms = is_array($searchTerms) ? count($searchTerms) : 0;
+            $count = !$searchTerms
                 ? 0
                 : round(
-                    $searchTerms[$index % count($searchTerms)]['count'] * (
+                    $searchTerms[$index % $countSearchTerms]['count'] * (
                         $configurableProductsCount / ($simpleProductsCount + $configurableProductsCount)
                     )
                 );
@@ -858,8 +861,8 @@ private function getDescriptionClosure(
                 $maxAmountOfWordsDescription,
                 $descriptionPrefix . '-' . $index
             ) .
-            ($index <= ($count * count($searchTerms)) ? ' ' .
-            $searchTerms[$index % count($searchTerms)]['term'] : '');
+            ($index <= ($count * $countSearchTerms) ? ' ' .
+            $searchTerms[$index % $countSearchTerms]['term'] : '');
         };
     }
 
diff --git a/setup/src/Magento/Setup/Model/FixtureGenerator/BundleProductTemplateGenerator.php b/setup/src/Magento/Setup/Model/FixtureGenerator/BundleProductTemplateGenerator.php
index 6bdb3b761c9..791ced0886d 100644
--- a/setup/src/Magento/Setup/Model/FixtureGenerator/BundleProductTemplateGenerator.php
+++ b/setup/src/Magento/Setup/Model/FixtureGenerator/BundleProductTemplateGenerator.php
@@ -82,14 +82,14 @@ private function getProductTemplate($attributeSet)
         $bundleOptions = $this->fixture['_bundle_options'];
         $bundleProductsPerOption = $this->fixture['_bundle_products_per_option'];
         $bundleVariationSkuPattern = $this->fixture['_bundle_variation_sku_pattern'];
-        $productRandomizerNumber = crc32(mt_rand(1, PHP_INT_MAX));
+        $productRandomizerNumber = crc32(random_int(1, PHP_INT_MAX));
         $bundleProduct = $this->productFactory->create([
             'data' => [
                 'attribute_set_id' => $attributeSet,
                 'type_id' => Type::TYPE_BUNDLE,
                 'name' => 'template name' . $productRandomizerNumber,
                 'url_key' => 'template-url' . $productRandomizerNumber,
-                'sku' => 'template_sku' . $productRandomizerNumber,
+                'sku' => 'template_sku_bundle' . $productRandomizerNumber,
                 'price' => 10,
                 'visibility' => Visibility::VISIBILITY_BOTH,
                 'status' => Status::STATUS_ENABLED,
diff --git a/setup/src/Magento/Setup/Model/FixtureGenerator/ConfigurableProductTemplateGenerator.php b/setup/src/Magento/Setup/Model/FixtureGenerator/ConfigurableProductTemplateGenerator.php
index 2d82c64d1ca..d70c21d6553 100644
--- a/setup/src/Magento/Setup/Model/FixtureGenerator/ConfigurableProductTemplateGenerator.php
+++ b/setup/src/Magento/Setup/Model/FixtureGenerator/ConfigurableProductTemplateGenerator.php
@@ -65,7 +65,6 @@ public function generateEntity()
     {
         $attributeSet = $this->fixture['attribute_set_id'];
         $product = $this->getProductTemplate($attributeSet);
-
         $product->save();
 
         return $product;
@@ -79,14 +78,14 @@ public function generateEntity()
      */
     private function getProductTemplate($attributeSet)
     {
-        $productRandomizerNumber = crc32(mt_rand(1, PHP_INT_MAX));
+        $productRandomizerNumber = crc32(random_int(1, PHP_INT_MAX));
         $product = $this->productFactory->create([
             'data' => [
                 'attribute_set_id' => $attributeSet,
                 'type_id' => Configurable::TYPE_CODE,
                 'name' => 'template name' . $productRandomizerNumber,
                 'url_key' => 'template-url' . $productRandomizerNumber,
-                'sku' => 'template_sku' . $productRandomizerNumber,
+                'sku' => 'template_sku_configurable' . $productRandomizerNumber,
                 'meta_description' => 'Configurable Product',
                 'meta_keyword' => $productRandomizerNumber,
                 'meta_title' => $productRandomizerNumber,
diff --git a/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php b/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php
index baeeec92a29..b8c15f09faf 100644
--- a/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php
+++ b/setup/src/Magento/Setup/Model/FixtureGenerator/ProductGenerator.php
@@ -170,7 +170,8 @@ public function generate($products, $fixtureMap)
                 ],
             ],
         ];
-        if (count($fixtureMap['website_ids'](1, 0)) === 1) {
+        $websiteIdsFixtures = $fixtureMap['website_ids'](1, 0);
+        if ((is_array($websiteIdsFixtures) && count($websiteIdsFixtures) === 1) || $websiteIdsFixtures != null) {
             // Get website id from fixture in case when one site is assigned per product
             $customTableMap['catalog_product_website'] = [
                 'fields' => [
diff --git a/setup/src/Magento/Setup/Model/FixtureGenerator/SimpleProductTemplateGenerator.php b/setup/src/Magento/Setup/Model/FixtureGenerator/SimpleProductTemplateGenerator.php
index 5e0c60e47dc..662bd4c5ca3 100644
--- a/setup/src/Magento/Setup/Model/FixtureGenerator/SimpleProductTemplateGenerator.php
+++ b/setup/src/Magento/Setup/Model/FixtureGenerator/SimpleProductTemplateGenerator.php
@@ -62,14 +62,14 @@ public function generateEntity()
      */
     private function getProductTemplate($attributeSet, $additionalAttributes = [])
     {
-        $productRandomizerNumber = crc32(mt_rand(1, PHP_INT_MAX));
+        $productRandomizerNumber = crc32(random_int(1, PHP_INT_MAX));
         $product = $this->productFactory->create([
             'data' => [
                 'attribute_set_id' => $attributeSet,
                 'type_id' => Type::TYPE_SIMPLE,
                 'name' => 'template name' . $productRandomizerNumber,
                 'url_key' => 'template-url' . $productRandomizerNumber,
-                'sku' => 'template_sku' . $productRandomizerNumber,
+                'sku' => 'template_sku_simple' . $productRandomizerNumber,
                 'price' => 10,
                 'visibility' => Visibility::VISIBILITY_BOTH,
                 'status' => Status::STATUS_ENABLED,
diff --git a/setup/src/Magento/Setup/Module/I18n/Pack/Generator.php b/setup/src/Magento/Setup/Module/I18n/Pack/Generator.php
index 720fc351bea..d1da0a16487 100644
--- a/setup/src/Magento/Setup/Module/I18n/Pack/Generator.php
+++ b/setup/src/Magento/Setup/Module/I18n/Pack/Generator.php
@@ -71,7 +71,8 @@ public function generate(
         $locale = $this->factory->createLocale($locale);
         $dictionary = $this->dictionaryLoader->load($dictionaryPath);
 
-        if (!count($dictionary->getPhrases())) {
+        $phrases = $dictionary->getPhrases();
+        if (!is_array($phrases) || !count($phrases)) {
             throw new \UnexpectedValueException('No phrases have been found by the specified path.');
         }
 
diff --git a/setup/src/Magento/Setup/Test/Unit/Controller/ExtensionGridTest.php b/setup/src/Magento/Setup/Test/Unit/Controller/ExtensionGridTest.php
index e69bf229c4e..febcbd1f8db 100644
--- a/setup/src/Magento/Setup/Test/Unit/Controller/ExtensionGridTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Controller/ExtensionGridTest.php
@@ -110,13 +110,13 @@ public function testExtensionsAction()
             ->method('syncPackagesData')
             ->willReturn($this->lastSyncData);
         $this->packagesAuthMock->expects($this->once())
-             ->method('getAuthJsonData')
-             ->willReturn(
-                 [
-                     'username' => 'someusername',
-                     'password' => 'somepassword'
-                 ]
-             );
+            ->method('getAuthJsonData')
+            ->willReturn(
+                [
+                    'username' => 'someusername',
+                    'password' => 'somepassword'
+                ]
+            );
 
         $jsonModel = $this->controller->extensionsAction();
         $this->assertInstanceOf(\Zend\View\Model\JsonModel::class, $jsonModel);
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/GeneratorTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/GeneratorTest.php
index 3395596f399..e1688289493 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/GeneratorTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Pack/GeneratorTest.php
@@ -102,6 +102,9 @@ public function testGenerateEmptyFile()
             ->method('load')
             ->with($dictionaryPath)
             ->will($this->returnValue($this->dictionaryMock));
+        $this->dictionaryMock->expects($this->once())
+            ->method('getPhrases')
+            ->will($this->returnValue([]));
 
         $this->_generator->generate($dictionaryPath, $localeString, $mode, $allowDuplicates);
     }
diff --git a/setup/view/magento/setup/readiness-check.phtml b/setup/view/magento/setup/readiness-check.phtml
index 6c6c2fbc39f..71044ab3718 100644
--- a/setup/view/magento/setup/readiness-check.phtml
+++ b/setup/view/magento/setup/readiness-check.phtml
@@ -18,7 +18,7 @@
             <button
                 type="button"
                 class="btn"
-                ng-click="goToStart()"
+                disabled="disabled"
                 >Back</button>
         </div>
         <div class="btn-wrap btn-wrap-try-again"